b=<12415>
r=<adilger,green>

Fix check for s->history allocation NULL return.
b=11039
i=alex

i=kalpak
i=johann

 - bug in quota handling fixed (found with sanity-quota.sh)

b=12678
i=adilger
i=scjody

Severity   : enhancement
Bugzilla   : 12678
Description: remove fs_prep_san_write operation and related patches
Details    : remove the ext3-san-jdike patches which are no longer useful.

b=11324
i=adilger
i=alex

Severity   : normal
Frequency  : rare
Bugzilla   : 11324
Description: LDISKFS-fs error (device sdc): ldiskfs_free_blocks
Details    : a disk corruption can cause the mballoc code to assert on a
	     double free.

update from b1_6

Rename autoMakefile.toplevel.am back to autoMakefile.am.toplevel to fix
other branches (the top level lustre module is shared between most
branches, unfortunately.)

b=12068

Move to new ldiskfs series, formerly known as ldiskfs2.

b=12068

Add --disable-modules to fix LTS build failure.

b=12068

Fix weird build issue

Initial commit of new ldiskfs module.  This is based on ldiskfs from
b1_6; patches and series files are identical to those found there.

b=12068
i=mjmac
i=brian

Fix whitespace difference that caused patch reject.
b=10651

Fix the nanosecond timestamp patches to declare all of the missing fields
in the kernel patches.
b=10651
i=green
i=kalpak

b=11424
r=scjody
rc=alex

Merge from LLNL chaos tree.

Fix whitespace in patch context.

Use EXT4_ for feature flag instead of EXT3_ to match upstream.
b=10651

Fix patch to apply equally well without obsolete ext3-san-jdike-*.patch.
b=11725

Rename ext3-disable-write-barrier-by-default-2.6-sles10.patch so it will
be included in tarballs produced on RHEL 4 systems.

b=12224
i=adilger
i=nathan

This patch was not applying due to some whitespace changes made in ext3-nlinks-2.6.9.patch by Andreas.
I have modified the nanosecond patch to reflect the changes.

Use EXT4_FEATURE_RO_COMPAT_DIR_NLINK to match upstream e2fsprogs.
b=3244

i=Andreas Dilger

Description: Addition of nanosecond timestamps.

The nanosecond patches have been added to both the ldiskfs and ldiskfs2 series
 for 2.6.5-sles9, 2.6.9-rhel4, 2.6.16-sles10, and 2.6.18-vanilla.

Move quota support from ldiskfs to lvfs.

b=11981
r=adilger
r=nathan

b=11801
r=adilger
r=green

Fork ext3-extents-2.6.15.patch to apply to latest SLES 10 kernel.

Remove the broken multi-mount-protection patch.

struct dentry_params renamed to lvfs_dentry_params and moved into
lvfs_linux.h

b=11248
r=adilger

r=Andreas Dilger

Description: Addition of EXT3_FEATURE_RO_COMPAT_DIR_NLINKS flag for
             > 32000 subdirectories

Details    : Add EXT3_FEATURE_RO_COMPAT_DIR_NLINK flag to
             EXT3_FEATURE_RO_COMPAT_SUPP. This flag will be set whenever
             subdirectory count crosses 32000. This will aid e2fsck to
             correctly handle more than 32000 subdirectories.

Some minor cleanups to make extents, mballoc kernel patches the same.
Use ext3_fsblk_t as appropriate for 2.6.18.
b=11675

Fix 2.6.18 ext3 mballoc, extents patches for several omissions.
Reorder patch hunks to match other patches to facilitate comparisons.
b=10090  ldiskfs corruption under memory pressure, coverity fixes
b=6191   mballoc fails on x86_64 > 2TB
b=10634  mballoc using wrong find_next_bit() on big endian systems
b=6449   don't print "too long searching" message to console

Compile tested.

b=7085

 - port old fixes from b1_4 to HEAD (extents related)
 - unify extents & fsfilt codebase with fsfilt

 - make extents,mballoc a default options for OST

 - reservation feature in ext3 hurts test #3: disable it

r:alex
add lookup-raw patches for raw lookup acceptance tests

 - clean more files at clean time

some patches fix for lustre in FC3