Commit 1976b2b3 authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Anna Schumaker
Browse files

NFSv4.1 query for fs_location attr on a new file system 



Query the server for other possible trunkable locations for a given
file system on a 4.1+ mount.

v2:
-- added missing static to nfs4_discover_trunking,
reported by the kernel test robot

Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 8a59bb93

fs/nfs/client.c

+7 −0
Original line number Diff line number Diff line
@@ -860,6 +860,13 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str 
			server->namelen = pathinfo.max_namelen;

	}



	if (clp->rpc_ops->discover_trunking != NULL &&

			(server->caps & NFS_CAP_FS_LOCATIONS)) {

		error = clp->rpc_ops->discover_trunking(server, mntfh);

		if (error < 0)

			return error;

	}



	return 0;

}

fs/nfs/nfs4_fs.h

+5 −4
Original line number Diff line number Diff line
@@ -260,8 +260,8 @@ struct nfs4_state_maintenance_ops { 
};



struct nfs4_mig_recovery_ops {

	int (*get_locations)(struct inode *, struct nfs4_fs_locations *,

		struct page *, const struct cred *);

	int (*get_locations)(struct nfs_server *, struct nfs_fh *,

		struct nfs4_fs_locations *, struct page *, const struct cred *);

	int (*fsid_present)(struct inode *, const struct cred *);

};
@@ -302,7 +302,8 @@ extern int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait); 
extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle);

extern int nfs4_proc_fs_locations(struct rpc_clnt *, struct inode *, const struct qstr *,

				  struct nfs4_fs_locations *, struct page *);

extern int nfs4_proc_get_locations(struct inode *, struct nfs4_fs_locations *,

extern int nfs4_proc_get_locations(struct nfs_server *, struct nfs_fh *,

				   struct nfs4_fs_locations *,

				   struct page *page, const struct cred *);

extern int nfs4_proc_fsid_present(struct inode *, const struct cred *);

extern struct rpc_clnt *nfs4_proc_lookup_mountpoint(struct inode *,

fs/nfs/nfs4proc.c

+66 −10
Original line number Diff line number Diff line
@@ -3935,6 +3935,60 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) 
	return err;

}



static int _nfs4_discover_trunking(struct nfs_server *server,

				   struct nfs_fh *fhandle)

{

	struct nfs4_fs_locations *locations = NULL;

	struct page *page;

	const struct cred *cred;

	struct nfs_client *clp = server->nfs_client;

	const struct nfs4_state_maintenance_ops *ops =

		clp->cl_mvops->state_renewal_ops;

	int status = -ENOMEM;



	cred = ops->get_state_renewal_cred(clp);

	if (cred == NULL) {

		cred = nfs4_get_clid_cred(clp);

		if (cred == NULL)

			return -ENOKEY;

	}



	page = alloc_page(GFP_KERNEL);

	locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL);

	if (page == NULL || locations == NULL)

		goto out;



	status = nfs4_proc_get_locations(server, fhandle, locations, page,

					 cred);

	if (status)

		goto out;

out:

	if (page)

		__free_page(page);

	kfree(locations);

	return status;

}



static int nfs4_discover_trunking(struct nfs_server *server,

				  struct nfs_fh *fhandle)

{

	struct nfs4_exception exception = {

		.interruptible = true,

	};

	struct nfs_client *clp = server->nfs_client;

	int err = 0;



	if (!nfs4_has_session(clp))

		goto out;

	do {

		err = nfs4_handle_exception(server,

				_nfs4_discover_trunking(server, fhandle),

				&exception);

	} while (exception.retry);

out:

	return err;

}



static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,

		struct nfs_fsinfo *info)

{
@@ -7823,18 +7877,18 @@ int nfs4_proc_fs_locations(struct rpc_clnt *client, struct inode *dir, 
 * appended to this compound to identify the client ID which is

 * performing recovery.

 */

static int _nfs40_proc_get_locations(struct inode *inode,

static int _nfs40_proc_get_locations(struct nfs_server *server,

				     struct nfs_fh *fhandle,

				     struct nfs4_fs_locations *locations,

				     struct page *page, const struct cred *cred)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct rpc_clnt *clnt = server->client;

	u32 bitmask[2] = {

		[0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS,

	};

	struct nfs4_fs_locations_arg args = {

		.clientid	= server->nfs_client->cl_clientid,

		.fh		= NFS_FH(inode),

		.fh		= fhandle,

		.page		= page,

		.bitmask	= bitmask,

		.migration	= 1,		/* skip LOOKUP */
@@ -7880,17 +7934,17 @@ static int _nfs40_proc_get_locations(struct inode *inode, 
 * When the client supports GETATTR(fs_locations_info), it can

 * be plumbed in here.

 */

static int _nfs41_proc_get_locations(struct inode *inode,

static int _nfs41_proc_get_locations(struct nfs_server *server,

				     struct nfs_fh *fhandle,

				     struct nfs4_fs_locations *locations,

				     struct page *page, const struct cred *cred)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct rpc_clnt *clnt = server->client;

	u32 bitmask[2] = {

		[0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS,

	};

	struct nfs4_fs_locations_arg args = {

		.fh		= NFS_FH(inode),

		.fh		= fhandle,

		.page		= page,

		.bitmask	= bitmask,

		.migration	= 1,		/* skip LOOKUP */
@@ -7939,11 +7993,11 @@ static int _nfs41_proc_get_locations(struct inode *inode, 
 * -NFS4ERR_LEASE_MOVED is returned if the server still has leases

 * from this client that require migration recovery.

 */

int nfs4_proc_get_locations(struct inode *inode,

int nfs4_proc_get_locations(struct nfs_server *server,

			    struct nfs_fh *fhandle,

			    struct nfs4_fs_locations *locations,

			    struct page *page, const struct cred *cred)

{

	struct nfs_server *server = NFS_SERVER(inode);

	struct nfs_client *clp = server->nfs_client;

	const struct nfs4_mig_recovery_ops *ops =

					clp->cl_mvops->mig_recovery_ops;
@@ -7956,10 +8010,11 @@ int nfs4_proc_get_locations(struct inode *inode, 
		(unsigned long long)server->fsid.major,

		(unsigned long long)server->fsid.minor,

		clp->cl_hostname);

	nfs_display_fhandle(NFS_FH(inode), __func__);

	nfs_display_fhandle(fhandle, __func__);



	do {

		status = ops->get_locations(inode, locations, page, cred);

		status = ops->get_locations(server, fhandle, locations, page,

					    cred);

		if (status != -NFS4ERR_DELAY)

			break;

		nfs4_handle_exception(server, status, &exception);
@@ -10428,6 +10483,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.free_client	= nfs4_free_client,

	.create_server	= nfs4_create_server,

	.clone_server	= nfs_clone_server,

	.discover_trunking = nfs4_discover_trunking,

};



static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {

fs/nfs/nfs4state.c

+2 −1
Original line number Diff line number Diff line
@@ -2098,7 +2098,8 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred 
	}



	inode = d_inode(server->super->s_root);

	result = nfs4_proc_get_locations(inode, locations, page, cred);

	result = nfs4_proc_get_locations(server, NFS_FH(inode), locations,

					 page, cred);

	if (result) {

		dprintk("<-- %s: failed to retrieve fs_locations: %d\n",

			__func__, result);

include/linux/nfs_xdr.h

+1 −0
Original line number Diff line number Diff line
@@ -1797,6 +1797,7 @@ struct nfs_rpc_ops { 
	struct nfs_server *(*create_server)(struct fs_context *);

	struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *,

					   struct nfs_fattr *, rpc_authflavor_t);

	int	(*discover_trunking)(struct nfs_server *, struct nfs_fh *);

};



/*