Whamcloud - gitweb
Branch b_release_1_4_6
authoradilger <adilger>
Tue, 13 Dec 2005 10:32:32 +0000 (10:32 +0000)
committeradilger <adilger>
Tue, 13 Dec 2005 10:32:32 +0000 (10:32 +0000)
commit4b1736af6d5e5803edf24379a5171fdea1e02763
tree62756c19337172c616e694129235fcc6abff97ac
parentbaeafb8cf59fa7e9b018e4b789c6bc8c84bcb254
Branch b_release_1_4_6
Fix merge breakage of join feature when IBITS locking was added.
b=9912
r=green

Move JOIN_FILE definitions away from potentially-conflicting VFS flags.
Minor cleanups in Join file code (line wrap, whitespace).
21 files changed:
lustre/include/liblustre.h
lustre/include/linux/lustre_idl.h
lustre/include/lustre/lustre_user.h
lustre/llite/file.c
lustre/mdc/mdc_lib.c
lustre/mdc/mdc_locks.c
lustre/mdc/mdc_request.c
lustre/mds/mds_join.c
lustre/mds/mds_open.c
lustre/mds/mds_reint.c
lustre/obdfilter/filter.c
lustre/obdfilter/filter_io.c
lustre/obdfilter/filter_log.c
lustre/obdfilter/filter_lvb.c
lustre/ost/ost_handler.c
lustre/ptlrpc/pack_generic.c
lustre/tests/sanity.sh
lustre/utils/lfs.c
lustre/utils/liblustreapi.c
lustre/utils/wirecheck.c
lustre/utils/wiretest.c