forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSv4.1: Replace get_device_info() with filelayout_get_device_info()

Browse source 
Fix the namespace pollution issue.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-09-18 21:02:29 -04:00
parent 9369a431bc
commit 78e4e05c64
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/nfs/blocklayout/blocklayout.c
View file

@ -874,7 +874,7 @@ static void free_blk_mountid(struct block_mount_id *mid)
} }
} }
/* This is mostly copied from the filelayout's get_device_info function. /* This is mostly copied from the filelayout_get_device_info function.
* It seems much of this should be at the generic pnfs level. * It seems much of this should be at the generic pnfs level.
*/ */
static struct pnfs_block_dev * static struct pnfs_block_dev *

2
fs/nfs/nfs4filelayout.c
View file

@ -608,7 +608,7 @@ filelayout_check_layout(struct pnfs_layout_hdr *lo,
d = nfs4_find_get_deviceid(NFS_SERVER(lo->plh_inode)->pnfs_curr_ld, d = nfs4_find_get_deviceid(NFS_SERVER(lo->plh_inode)->pnfs_curr_ld,
NFS_SERVER(lo->plh_inode)->nfs_client, id); NFS_SERVER(lo->plh_inode)->nfs_client, id);
if (d == NULL) { if (d == NULL) {
dsaddr = get_device_info(lo->plh_inode, id, gfp_flags); dsaddr = filelayout_get_device_info(lo->plh_inode, id, gfp_flags);
if (dsaddr == NULL) if (dsaddr == NULL)
goto out; goto out;
} else } else

2
fs/nfs/nfs4filelayout.h
View file

@ -158,7 +158,7 @@ struct nfs4_pnfs_ds *nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg,
extern void nfs4_fl_put_deviceid(struct nfs4_file_layout_dsaddr *dsaddr); extern void nfs4_fl_put_deviceid(struct nfs4_file_layout_dsaddr *dsaddr);
extern void nfs4_fl_free_deviceid(struct nfs4_file_layout_dsaddr *dsaddr); extern void nfs4_fl_free_deviceid(struct nfs4_file_layout_dsaddr *dsaddr);
struct nfs4_file_layout_dsaddr * struct nfs4_file_layout_dsaddr *
get_device_info(struct inode *inode, struct nfs4_deviceid *dev_id, gfp_t gfp_flags); filelayout_get_device_info(struct inode *inode, struct nfs4_deviceid *dev_id, gfp_t gfp_flags);
void nfs4_ds_disconnect(struct nfs_client *clp); void nfs4_ds_disconnect(struct nfs_client *clp);
#endif /* FS_NFS_NFS4FILELAYOUT_H */ #endif /* FS_NFS_NFS4FILELAYOUT_H */

2
fs/nfs/nfs4filelayoutdev.c
View file

@ -690,7 +690,7 @@ decode_and_add_device(struct inode *inode, struct pnfs_device *dev, gfp_t gfp_fl
* of available devices, and return it. * of available devices, and return it.
*/ */
struct nfs4_file_layout_dsaddr * struct nfs4_file_layout_dsaddr *
get_device_info(struct inode *inode, struct nfs4_deviceid *dev_id, gfp_t gfp_flags) filelayout_get_device_info(struct inode *inode, struct nfs4_deviceid *dev_id, gfp_t gfp_flags)
{ {
struct pnfs_device *pdev = NULL; struct pnfs_device *pdev = NULL;
u32 max_resp_sz; u32 max_resp_sz;