Commit 2671bfc3 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Remove secinfo knowledge out of the generic client 



And also remove the unneeded rpc_op.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent df011748

fs/nfs/internal.h

+0 −3
Original line number Diff line number Diff line
@@ -286,9 +286,6 @@ extern void nfs_sb_deactive(struct super_block *sb); 
extern char *nfs_path(char **p, struct dentry *dentry,

		      char *buffer, ssize_t buflen);

extern struct vfsmount *nfs_d_automount(struct path *path);

#ifdef CONFIG_NFS_V4

rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *);

#endif



/* getroot.c */

extern struct dentry *nfs_get_root(struct super_block *, struct nfs_fh *,

fs/nfs/namespace.c

+0 −29
Original line number Diff line number Diff line
@@ -119,35 +119,6 @@ char *nfs_path(char **p, struct dentry *dentry, char *buffer, ssize_t buflen) 
}



#ifdef CONFIG_NFS_V4

rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *flavors)

{

	struct gss_api_mech *mech;

	struct xdr_netobj oid;

	int i;

	rpc_authflavor_t pseudoflavor = RPC_AUTH_UNIX;



	for (i = 0; i < flavors->num_flavors; i++) {

		struct nfs4_secinfo_flavor *flavor;

		flavor = &flavors->flavors[i];



		if (flavor->flavor == RPC_AUTH_NULL || flavor->flavor == RPC_AUTH_UNIX) {

			pseudoflavor = flavor->flavor;

			break;

		} else if (flavor->flavor == RPC_AUTH_GSS) {

			oid.len  = flavor->gss.sec_oid4.len;

			oid.data = flavor->gss.sec_oid4.data;

			mech = gss_mech_get_by_OID(&oid);

			if (!mech)

				continue;

			pseudoflavor = gss_svc_to_pseudoflavor(mech, flavor->gss.service);

			gss_mech_put(mech);

			break;

		}

	}



	return pseudoflavor;

}



static struct rpc_clnt *nfs_lookup_mountpoint(struct inode *dir,

					      struct qstr *name,

					      struct nfs_fh *fh,

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ extern const struct dentry_operations nfs4_dentry_operations; 
extern const struct inode_operations nfs4_dir_inode_operations;



/* nfs4namespace.c */

rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *);

struct rpc_clnt *nfs4_create_sec_client(struct rpc_clnt *, struct inode *, struct qstr *);



/* nfs4proc.c */

fs/nfs/nfs4namespace.c

+29 −0
Original line number Diff line number Diff line
@@ -132,6 +132,35 @@ static size_t nfs_parse_server_name(char *string, size_t len, 
	return ret;

}



rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *flavors)

{

	struct gss_api_mech *mech;

	struct xdr_netobj oid;

	int i;

	rpc_authflavor_t pseudoflavor = RPC_AUTH_UNIX;



	for (i = 0; i < flavors->num_flavors; i++) {

		struct nfs4_secinfo_flavor *flavor;

		flavor = &flavors->flavors[i];



		if (flavor->flavor == RPC_AUTH_NULL || flavor->flavor == RPC_AUTH_UNIX) {

			pseudoflavor = flavor->flavor;

			break;

		} else if (flavor->flavor == RPC_AUTH_GSS) {

			oid.len  = flavor->gss.sec_oid4.len;

			oid.data = flavor->gss.sec_oid4.data;

			mech = gss_mech_get_by_OID(&oid);

			if (!mech)

				continue;

			pseudoflavor = gss_svc_to_pseudoflavor(mech, flavor->gss.service);

			gss_mech_put(mech);

			break;

		}

	}



	return pseudoflavor;

}



static rpc_authflavor_t nfs4_negotiate_security(struct inode *inode, struct qstr *name)

{

	struct page *page;

fs/nfs/nfs4proc.c

+0 −1
Original line number Diff line number Diff line
@@ -6610,7 +6610,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.close_context  = nfs4_close_context,

	.open_context	= nfs4_atomic_open,

	.init_client	= nfs4_init_client,

	.secinfo	= nfs4_proc_secinfo,

};



static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {