Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78e4e05c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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



Fix the namespace pollution issue.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9369a431

fs/nfs/blocklayout/blocklayout.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

 */

static struct pnfs_block_dev *

fs/nfs/nfs4filelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

				   NFS_SERVER(lo->plh_inode)->nfs_client, id);

	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)

			goto out;

	} else

fs/nfs/nfs4filelayout.h

+1 −1
Original line number Diff line number Diff line
@@ -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_free_deviceid(struct nfs4_file_layout_dsaddr *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);



#endif /* FS_NFS_NFS4FILELAYOUT_H */

fs/nfs/nfs4filelayoutdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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.

 */

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;

	u32 max_resp_sz;