- fix the getting own nid - use PtlGetId now

- set smfs flags on group subdirs

b=7085

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

- fix wrong record length

- changes in test45.sh

- store node id in audit records on OSS
- move audit hook from filter_commitrw() to fsfilt_smfs_map_inode_pages()
- fix invalid nid in osc_get_info()
- rework stat/open audit hooks to store file lustre id, not parent one
- audit errors while stat/open

- two equal statements in a row

upcalls, for debugging.

 - additional debug

Put only the filenames into the cvs-merge-conflicts file, so that
vi `cat cvs-merge-conflicts` works.

- md_close() chnaged to use mdc_op_data like other md_* functions instead of using obdo.
- fixed prototype declaration for llapi_lov_get_uuids() - bug #6900
- fixed error message in ll_gns_mount_object() - bug #7146

- a lot of fixes about memory allocation/freeing:
  - checks is memory is actually allocated by OBD_ALLOC() before sing it and do appropriate
    actions otherwise.

  - fixed many leaks on error paths.
  - fixed missed OBD_FREE(capa_hash) in capa_cache_cleanup()

- fixed few on stack allocatoins of mdc_op_data in new landed stuff.

- in smfs_mount_cache() fixes correct cleanup in the cases of memory allocation failures.
  Do mntput() for new mounted cache_mnt on error path.

- in smfs_umount_cache() nullify smb->smsi_cache_ftype and smb->smsi_ftype after freeing
  them, to prevent attempt to free again if smfs_umount_cache() is called second time.

positioning: make remote acl always occupy 2 buffers, just like local
acl.

- transfer only one audit record on one notify.
- make sure the connection has been established before using the mdc export on name reconstruction.

add type check in set_crypt

fix typo usage for set_crypt

Disable hlist macros unless compiling liblustre.  In b1_4 there are compat
macros in lustre_compat25.h that handle difference between 2.4 and 2.6
kernels instead of defining replacement macros.

b=7300

- fixes for making liblustre at least buildable (including fixes to compilation bug found by Brian recently)

some fixes about crypto api
1)some fixes about init inode key
2)some fixes about compute new mac

- set only LOV_EA in mds_reint_setattr() in the case of CMOBD reint as setting sid and pid will confuse master MDS.
- set mds_security to "null" in lustre_connect_mds() if not specified or panic is possible.

Check for error writing to acceptor $PIDFILE.
Accptor reports when it has exited to syslog, so we can trace if it is a
culprit in the "bind: address already in use" problem.
b=5509
b=7283

  ../../lustre/include/linux/lustre_sec.h:541: error: field `c_hash' has incomplete type

some fixes about crypto api

- typo fix in mds_set_info.

Bump keepalive interval to send fewer total keepalives.
Trying to determine if this is cause of BG/L EMAC "flood" issue at
cleanup time.

- only files on OSS should be audited
- audit_fill_id_rec is valid only on mds. Moved to mds_audit.c
- audit_ost_get_id() gets lustre id for OSS object for audit log

   openibnal (bz 7217)

*  remove WIRE_ATTR from iibanl kib_md_t (it's not a wire struct)