- fix 2072 with one extra argument to lvfs_fid2dentry

- remove some assertions from start and stop transactions because
  logging is showing some nested transactions that the assertions
  can't handle.
- updates to the network document with collected bits and pieces of
  router failover wisdom from Eric Barton.

diff --git a/lustre/lvfs/lvfs_common.c b/lustre/lvfs/lvfs_common.c
index cfaeb7f..6d18d0d 100644 (file)
--- a/lustre/lvfs/lvfs_common.c
+++ b/lustre/lvfs/lvfs_common.c
@@ -27,9 +27,9 @@
 
 #include <linux/lvfs.h>
 
-struct dentry *lvfs_fid2dentry(struct obd_run_ctxt *ctxt, __u64 id, __u32 gen,
+struct dentry *lvfs_fid2dentry(struct obd_run_ctxt *ctxt, __u64 id, __u32 gen, __u64 gr,
                                void *data)
 {
-        return ctxt->cb_ops.l_fid2dentry(id, gen, data);
+        return ctxt->cb_ops.l_fid2dentry(id, gen, gr, data);
 }
 EXPORT_SYMBOL(lvfs_fid2dentry);