Revert "LU-1199 build: Fix osd modules' Requires fields"

This reverts commit 01db1c21307554efab95c1c36dff1e404dda4867.
Revert "LU-1199 build: Overhaul lustre spec file and rpm build process"

This reverts commit a8a6fa15a1957ecadf8701e6ee8b53526d305bb6.
Revert "LU-1199 build: Overhaul ldiskfs spec file and build process"

This reverts commit 6a7fde762d8cea5ad8d1fbf7df773e6f9d271c80.
Revert "LU-1199 build: Drop unused LB_LDISKFS_RELEASE macros"

This reverts commit 9060c8f53e33af2e1097e7df4fabc598b52446c1.
Revert "LU-1199 build: Cleanup ldiskfs kernel config defines"

This reverts commit be22779ab4bf54c9c6690e2d732b24793e2f030d.
LU-1199 build: Cleanup ldiskfs kernel config defines

Make it more clear what the purpose of the "CONFIG_LDISKFS_*"
defines are with a comment, and separate them from options
that do not necessarily originate in the kernel source. All of
these options are needed for ldiskfs and some are needed by
osd-ldiskfs in the lustre file system. To handle these shared
options a extra autoconf header file is create containing only
the values of interest to osd-ldiskfs.

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Change-Id: I8e71b6cf471c4317b20fdce14d66f8b2883a226e
Patch-Set: 4
LU-1812 fsfilt: ext4_free_blocks() has changed slightly

ext4_free_blocks() now takes a buffer_head and explicit flags instead
of just metadata.  Test the presence of the buffer_head argument to
determine which ext4_free_blocks() is available.

see kernel commit e6362609b6c71c5b802026be9cf263bbdd67a50e

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Change-Id: I925df73a054613469866ec025ae412ead0ce9e56
Patch-Set: 19 (plus minor change of test include path by Morrone)
LU-1812 fsfilt: ext_pblock renamed to ext4_ext_pblock

For kernels 2.6.35 and above ext_pblock was renamed to
ext4_ext_pblock. With no more RHEL5 kernel support for
ldiskfs we also clean up more macros.

see kernel commit bf89d16f6ef5389f1b9d8046e838ec87b9b3f8b9
for pblock change.

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Signed-off-by: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Change-Id: I3ce7f27f6fd6826380e6f2f54b2d50d09d36f78a
Patch-Set: 13 (plus minor path change in test by Morrone)
LU-2473 ldiskfs: Add ldiskfs support for RHEL 6.4

Add an ldiskfs kernel patch series to support the RHEL 6.4 kernel.

The ldiskfs series selection macro (LB_LDISKFS_SERIES) is fixed up
to use the AS_VERSION_COMPARE, which allows us to check if the kernel
version is greater than or equal to a specific number, rather than
just a simple pattern match.

Change-Id: I894ace2d98e3d5c7481230794e9edf984bce7aee
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Patch-Set: 7
LU-1199 build: Drop unused LB_LDISKFS_RELEASE macros

The products of the LB_LDISKFS_RELEASE macros are completely
unused.  They also make some bad assumtions that prevent
building against the lustre-devel package, so we just remove
them.

If Lustre needs to know ldiskfs's version in the future, we
should simply add an ldiskfs header (that gets installed into
the lustre-devel rpm) that lustre can easily probe for that
information.

Change-Id: I40b96dc72f5076ba9a9dda3f41b31088fdfd4341
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
LU-1199 build: Overhaul ldiskfs spec file and build process

Rename rpm packages from "lustre-ldiskfs" to simply "ldiskfs".

The make "rpm" target now depends on the "srpm", using rpmbuild
--rebuild to make the binary rpms from the .src.rpm file.  This
will help to ensure that we don't break the the source rpm again
in the future.

Bump ldiskfs version to 4.1.0 (larger than LLNL's external 4.0.x
ldiskfs packages).

Adjust Lustre's build system to explicitly run ldiskfs's configure
script and explicitly pass configure options instead of implicitly
assuming that ldiskfs uses the same configure options as lustre.

Add an "ldiskfs-devel" package, which contains all that is
necessary to build lustre again ldiskfs.

Change-Id: Ia7aa6fe31b4b9fc74599269cfbdc400cdc70bb62
LU-1199 build: Overhaul lustre spec file and rpm build process

- Make it possible to override Requires and BuildRequires at
  rpmbuild time.
- Use rpmbuild --with/--without parameters.
- Group configuration settings for each distro into
  clear sections at the top of the spec file, rather than
  strewn throughout the file.
- Eliminate all configure_args parsing.  Instead explicitly
  pass arguments to rpmbuild as needed.
- Improve release string handling.  No more stray underscores
  in source rpm name!
- Don't include kernel string in version of source rpm.
- "make rpms" now employs "make src" to first build the
  source rpm.  This will help enforce disipline in keeping
  the source rpm rebuildable.

Change-Id: Id0612ade9f170d84518f01d4e8de654a7ba8af88
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
LU-2948 osc: Add timeout to osc_lru_reserve

If a thread ends up sleeping on the osc_lru_waitq, this patch ensures it
is woken up at least every 60 seconds and tries to perform LRU
reclaiming again. When the time out hits, a message is printed to the
console stating this happened. In addition, a lustre debug log is dumped
with D_CACHE information to help debug why the thread failed to reclaim
in the first place and why it was never woken up.

Test-Parameters: fortestonly
Signed-off-by: Prakash Surya <surya1@llnl.gov>
Change-Id: Iac643f2abb424f523d32265f93b4d05c828b0649
Patch-Set: 1

Conflicts:

	lustre/osc/osc_page.c