[PATCH 10/14] SQUASHME pnfs_submit: change decode_and_add_ds parameter

andros
2010-04-08T19:54:58Z

In preparation to use the generic deviceid cache

Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/nfs4filelayoutdev.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index 506ede1..4882149 100644
--- a/fs/nfs/nfs4filelayoutdev.c
+++ b/fs/nfs/nfs4filelayoutdev.c
@@ -456,7 +456,7 @@ nfs4_pnfs_ds_add(struct filelayout_mount_type *mt, struct nfs4_pnfs_ds **dsp,
}

static struct nfs4_pnfs_ds *
-decode_and_add_ds(uint32_t **pp, struct filelayout_mount_type *mt)
+decode_and_add_ds(uint32_t **pp, struct inode *inode)
{
struct nfs4_pnfs_ds *ds = NULL;
char r_addr[29]; /* max size of ip/port string */
@@ -493,7 +493,7 @@ decode_and_add_ds(uint32_t **pp, struct filelayout_mount_type *mt)
ip_addr = htonl((tmp[0]<<24) | (tmp[1]<<16) | (tmp[2]<<8) | (tmp[3]));
port = htons((tmp[4] << 8) | (tmp[5]));

- nfs4_pnfs_ds_add(mt, &ds, ip_addr, port, r_addr, len);
+ nfs4_pnfs_ds_add(FILE_MT(inode), &ds, ip_addr, port, r_addr, len);

dprintk("%s: addr:port string = %s\n", __func__, r_addr);
return ds;
@@ -572,8 +572,7 @@ decode_device(struct inode *ino, struct pnfs_device *pdev)
}
for (j = 0; j < dummy; j++) {
if (j == 0) {
- dsaddr->ds_list[i] = decode_and_add_ds(&p,
- FILE_MT(ino));
+ dsaddr->ds_list[i] = decode_and_add_ds(&p,ino);
if (dsaddr->ds_list[i] == NULL)
goto out_err_free;
} else {
--
1.6.6