b=10997
r=adilger

Description: lfs setstripe use optional parameters instead of postional parameters.

Remove "#if FOO" compiler warnings from -Wundef.
(Committed by adilger)

Define FMODE_READ and FMODE_WRITE for use in liblustre
(Committed by green)

Allow test 6 and 7 to be run in isolation.
Fix test file names.
Create test files in $DIR instead of $MOUNT.
(Committed by adilger)

openclose.c: Save errno before calling fprintf().
(Committed by adilger)

sanityN.sh: Kill multiop before exiting, if test fails.
Test is currently excluded, was retesting to see if it worked yet.
b=3192
(Committed by adilger)

r=adilger
r=nathan
r=green

Merge the following changes from b1_4:

lfs quotachown <file system> deletes security relevant setuid bit
b=11463
r=Adilger
(Committed by tianzy)

Land kernel config changes for 2.4 kernels from b_release_1_4_8 to b1_4.
(Committed by adilger)

b=10736
Add getattr on lookup operation for NFS, so that it can properl revalidate
file attributes.
(Committed by green)

r=adilger
r=green
r=nathan

Back out accidental commit

Branch HEAD

Merge from b_release_1_4_9:

b=11643
r=adilger

Make reiserfs to compile at the expense of disabling quotas

Untested patch for handling uninitialized block groups.
Adding to CVS to avoid loss, not currently in any patch series.
b=11269

This is a potential null pointer dereference.
Caught by HEAD's conf_sanity test 29

i=adilger
wait until config file is finished before allowing MDT clients to connect

Update recommended e2fsprogs version.

Fixes in b1_4 missing from HEAD:
- enable test 14c (b=4035, b=7040)
- don't print an error because /proc/sys/lustre/fail_loc is missing if
  the lustre is stopped when error() is called
- cleanup echo device after test_28 is done

Add llapi_is_lustre_mnt() to check for client filesystems, so that we
can keep the API of llapi_is_lustre_mnttype() the same.
b=10747
r=nathan

b=11801
r=adilger
r=green

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

Fix liblustre linking for LustreFUSE.

Pass correct variable to obd_statfs_rqset().
Unnoticed because of missing #ifdef _HAVE_STATVFS

Fix for LustreFUSE building.

Add comment to ensure people keep branch list sorted.

Merge SLES 10 build fix from b1_4.

b=11804
r=adilger

Update SLES 10 kernel to 2.6.16.27-0.9.

b=11013
r=adilger

implement a common hash table, so it will be used as a hash class.
in this patch, finished :
1. " UUID <--> export " hash
2. " NID  <--> export " hash
3. "NetPeer <--> connect" hash

Update RHEL 4 kernel to 2.6.9-42.0.10.EL.

Merge from b_release_1_4_9: update SLES 9 kernel to 2.6.5-7.283.

Use intent directly instead of file->f_it, which doesn't exist on patchless
clients.
r=shadow (original patch)

    propagate portals completion errors up to LNET.  The fix propagates the
    error and logs a D_NETERROR.

    either a NID or a process ID.

b=11090
r=green

Description: Checking the version difference of client vs. server, report error if the gap is too big.

Add ChangeLog entry for bug 10889.

Have lustre/ChangeLog match b1_4 as much as possible.

Avoid duplicate definition of SYSIO_INTERFACE_NAME.
b=11175
r=nic (original patch)

Remove old, dangerous tcp zero copy patches.

Remove old, dangerous tcp-zero-copy patch from 2.6.18 series.