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

Commit 1775bc34 authored by Benny Halevy's avatar Benny Halevy Committed by Boaz Harrosh
Browse files

NFSv4.1: purge deviceid cache on nfs_free_client 



Use the pnfs_layoutdriver_type both as a qualifier for the deviceid,
distinguishing deviceid from different layout types on the server,
and for freeing the layout-driver allocated structure containing the
nfs4_deviceid_node.

[BUG in _deviceid_purge_client]
[layout_driver MUST set free_deviceid_node if using dev-cache]
[let ver < 4.1 compile]
Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
[removed EXPORT_SYMBOL_GPL(nfs4_deviceid_purge_client)]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
parent a1eaecbc

fs/nfs/client.c

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,8 @@ static void nfs_free_client(struct nfs_client *clp) 
	if (clp->cl_machine_cred != NULL)

		put_rpccred(clp->cl_machine_cred);



	nfs4_deviceid_purge_client(clp);



	kfree(clp->cl_hostname);

	kfree(clp);

fs/nfs/nfs4filelayout.c

+7 −0
Original line number Diff line number Diff line
@@ -862,6 +862,12 @@ filelayout_commit_pagelist(struct inode *inode, struct list_head *mds_pages, 
	return -ENOMEM;

}



static void

filelayout_free_deveiceid_node(struct nfs4_deviceid_node *d)

{

	nfs4_fl_free_deviceid(container_of(d, struct nfs4_file_layout_dsaddr, id_node));

}



static struct pnfs_layoutdriver_type filelayout_type = {

	.id			= LAYOUT_NFSV4_1_FILES,

	.name			= "LAYOUT_NFSV4_1_FILES",
@@ -874,6 +880,7 @@ static struct pnfs_layoutdriver_type filelayout_type = { 
	.commit_pagelist	= filelayout_commit_pagelist,

	.read_pagelist		= filelayout_read_pagelist,

	.write_pagelist		= filelayout_write_pagelist,

	.free_deviceid_node	= filelayout_free_deveiceid_node,

};



static int __init nfs4filelayout_init(void)

fs/nfs/nfs4filelayout.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ u32 nfs4_fl_calc_ds_index(struct pnfs_layout_segment *lseg, u32 j); 
struct nfs4_pnfs_ds *nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg,

					u32 ds_idx);

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);

fs/nfs/nfs4filelayoutdev.c

+5 −4
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ destroy_ds(struct nfs4_pnfs_ds *ds) 
	kfree(ds);

}



static void

void

nfs4_fl_free_deviceid(struct nfs4_file_layout_dsaddr *dsaddr)

{

	struct nfs4_pnfs_ds *ds;
@@ -386,7 +386,9 @@ decode_device(struct inode *ino, struct pnfs_device *pdev, gfp_t gfp_flags) 
	dsaddr->stripe_indices = stripe_indices;

	stripe_indices = NULL;

	dsaddr->ds_num = num;

	nfs4_init_deviceid_node(&dsaddr->id_node, NFS_SERVER(ino)->nfs_client,

	nfs4_init_deviceid_node(&dsaddr->id_node,

				NFS_SERVER(ino)->pnfs_curr_ld,

				NFS_SERVER(ino)->nfs_client,

				&pdev->dev_id);



	for (i = 0; i < dsaddr->ds_num; i++) {
@@ -548,8 +550,7 @@ get_device_info(struct inode *inode, struct nfs4_deviceid *dev_id, gfp_t gfp_fla 
void

nfs4_fl_put_deviceid(struct nfs4_file_layout_dsaddr *dsaddr)

{

	if (nfs4_put_deviceid_node(&dsaddr->id_node))

		nfs4_fl_free_deviceid(dsaddr);

	nfs4_put_deviceid_node(&dsaddr->id_node);

}



/*

fs/nfs/pnfs.h

+11 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ enum { 
	NFS_LAYOUT_DESTROYED,		/* no new use of layout allowed */

};



struct nfs4_deviceid_node;



/* Per-layout driver specific registration structure */

struct pnfs_layoutdriver_type {

	struct list_head pnfs_tblid;
@@ -90,6 +92,8 @@ struct pnfs_layoutdriver_type { 
	 */

	enum pnfs_try_status (*read_pagelist) (struct nfs_read_data *nfs_data);

	enum pnfs_try_status (*write_pagelist) (struct nfs_write_data *nfs_data, int how);



	void (*free_deviceid_node) (struct nfs4_deviceid_node *);

};



struct pnfs_layout_hdr {
@@ -160,6 +164,7 @@ int pnfs_layoutcommit_inode(struct inode *inode, bool sync); 
/* pnfs_dev.c */

struct nfs4_deviceid_node {

	struct hlist_node		node;

	const struct pnfs_layoutdriver_type *ld;

	const struct nfs_client		*nfs_client;

	struct nfs4_deviceid		deviceid;

	atomic_t			ref;
@@ -169,10 +174,12 @@ void nfs4_print_deviceid(const struct nfs4_deviceid *dev_id); 
struct nfs4_deviceid_node *nfs4_find_get_deviceid(const struct nfs_client *, const struct nfs4_deviceid *);

struct nfs4_deviceid_node *nfs4_unhash_put_deviceid(const struct nfs_client *, const struct nfs4_deviceid *);

void nfs4_init_deviceid_node(struct nfs4_deviceid_node *,

			     const struct pnfs_layoutdriver_type *,

			     const struct nfs_client *,

			     const struct nfs4_deviceid *);

struct nfs4_deviceid_node *nfs4_insert_deviceid_node(struct nfs4_deviceid_node *);

bool nfs4_put_deviceid_node(struct nfs4_deviceid_node *);

void nfs4_deviceid_purge_client(const struct nfs_client *);



static inline int lo_fail_bit(u32 iomode)

{
@@ -349,6 +356,10 @@ static inline int pnfs_layoutcommit_inode(struct inode *inode, bool sync) 
{

	return 0;

}



static inline void nfs4_deviceid_purge_client(struct nfs_client *ncl)

{

}

#endif /* CONFIG_NFS_V4_1 */



#endif /* FS_NFS_PNFS_H */