diff options
| author | Bryan Schumaker <bjschuma@netapp.com> | 2012-01-26 16:54:23 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-02-06 18:48:01 -0500 |
| commit | e6499c6f4b5f56a16f8b8ef60529c1da28b13aea (patch) | |
| tree | 9212b8d42b0cb24e68c46509e3d924f2b9d30f41 /include/linux/nfs_idmap.h | |
| parent | 2d3fe01c36a9b881fae89c5bdf4085a4d7d53ae1 (diff) | |
| download | olio-linux-3.10-e6499c6f4b5f56a16f8b8ef60529c1da28b13aea.tar.xz olio-linux-3.10-e6499c6f4b5f56a16f8b8ef60529c1da28b13aea.zip | |
NFS: Fall back on old idmapper if request_key() fails
This patch removes the CONFIG_NFS_USE_NEW_IDMAPPER compile option.
First, the idmapper will attempt to map the id using /sbin/request-key
and nfsidmap. If this fails (if /etc/request-key.conf is not configured
properly) then the idmapper will call the legacy code to perform the
mapping. I left a comment stating where the legacy code begins to make
it easier for somebody to remove in the future.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs_idmap.h')
| -rw-r--r-- | include/linux/nfs_idmap.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h index 3c9eeb7da64..7eed2012d28 100644 --- a/include/linux/nfs_idmap.h +++ b/include/linux/nfs_idmap.h @@ -82,24 +82,9 @@ static inline void nfs_idmap_quit(void) {} #endif -#ifdef CONFIG_NFS_USE_NEW_IDMAPPER - -static inline int nfs_idmap_new(struct nfs_client *clp) -{ - return 0; -} - -static inline void nfs_idmap_delete(struct nfs_client *clp) -{ -} - -#else /* CONFIG_NFS_USE_NEW_IDMAPPER not set */ - int nfs_idmap_new(struct nfs_client *); void nfs_idmap_delete(struct nfs_client *); -#endif /* CONFIG_NFS_USE_NEW_IDMAPPER */ - void nfs_fattr_init_names(struct nfs_fattr *fattr, struct nfs4_string *owner_name, struct nfs4_string *group_name); |