---

yaml --- r: 260835 b: refs/heads/master c: 14f9a60 h: refs/heads/master i: 260833: cef3ec2 260831: aa0b60a v: v3
git-mirror · Jul 12, 2011 · cd1d375 · cd1d375
1 parent 238cccf
commit cd1d375
Show file tree

Hide file tree

Showing 3 changed files with 244 additions and 133 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9895cb69b07a4b17d8fdae26667f9a9fba5183b
+refs/heads/master: 14f9a6076f5388f3fd6341ad4b841337b28fc825
diff --git a/trunk/fs/nfs/nfs4filelayout.h b/trunk/fs/nfs/nfs4filelayout.h
@@ -47,11 +47,17 @@ enum stripetype4 {
 };
 
 /* Individual ip address */
+struct nfs4_pnfs_ds_addr {
+	struct sockaddr_storage	da_addr;
+	size_t			da_addrlen;
+	struct list_head	da_node;  /* nfs4_pnfs_dev_hlist dev_dslist */
+	char			*da_remotestr;	/* human readable addr+port */
+};
+
 struct nfs4_pnfs_ds {
 	struct list_head	ds_node;  /* nfs4_pnfs_dev_hlist dev_dslist */
-	struct sockaddr_storage	ds_addr;
-	size_t			ds_addrlen;
-	char			*ds_remotestr;	/* human readable addr+port */
+	char			*ds_remotestr;	/* comma sep list of addrs */
+	struct list_head	ds_addrs;
 	struct nfs_client	*ds_clp;
 	atomic_t		ds_count;
 };