[PATCH 11/14] SQUASHME pnfs_submit: change nfs4_pnfs_ds_add 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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index 4882149..2cbe931 100644
--- a/fs/nfs/nfs4filelayoutdev.c
+++ b/fs/nfs/nfs4filelayoutdev.c
@@ -416,11 +416,11 @@ nfs4_pnfs_device_add(struct filelayout_mount_type *mt,
}

static void
-nfs4_pnfs_ds_add(struct filelayout_mount_type *mt, struct nfs4_pnfs_ds **dsp,
+nfs4_pnfs_ds_add(struct inode *inode, struct nfs4_pnfs_ds **dsp,
u32 ip_addr, u32 port, char *r_addr, int len)
{
struct nfs4_pnfs_ds *tmp_ds, *ds;
- struct nfs4_pnfs_dev_hlist *hlist = mt->hlist;
+ struct nfs4_pnfs_dev_hlist *hlist = FILE_MT(inode)->hlist;

*dsp = NULL;

@@ -493,7 +493,7 @@ decode_and_add_ds(uint32_t **pp, struct inode *inode)
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(FILE_MT(inode), &ds, ip_addr, port, r_addr, len);
+ nfs4_pnfs_ds_add(inode, &ds, ip_addr, port, r_addr, len);

dprintk("%s: addr:port string = %s\n", __func__, r_addr);
return ds;
--
1.6.6