Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10

Note conflict: Chuck's patches modified (and made static)
gss_mech_get_by_OID, which is still needed by gss-proxy patches.

The conflict resolution is a bit minimal; we may want some more cleanup.

1 files changed, 11 insertions, 13 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 888a600dad8c..78272185a13d 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3083,10 +3083,9 @@ nfsd4_encode_rename(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_
 
 static __be32
 nfsd4_do_encode_secinfo(struct nfsd4_compoundres *resp,
-                         __be32 nfserr,struct svc_export *exp)
+                         __be32 nfserr, struct svc_export *exp)
 {
-        int i = 0;
-        u32 nflavs;
+        u32 i, nflavs;
         struct exp_flavor_info *flavs;
         struct exp_flavor_info def_flavs[2];
         __be32 *p;
@@ -3117,30 +3116,29 @@ nfsd4_do_encode_secinfo(struct nfsd4_compoundres *resp,
         WRITE32(nflavs);
         ADJUST_ARGS();
         for (i = 0; i < nflavs; i++) {
-                u32 flav = flavs[i].pseudoflavor;
-                struct gss_api_mech *gm = gss_mech_get_by_pseudoflavor(flav);
+                struct rpcsec_gss_info info;
 
-                if (gm) {
+                if (rpcauth_get_gssinfo(flavs[i].pseudoflavor, &info) == 0) {
                         RESERVE_SPACE(4);
                         WRITE32(RPC_AUTH_GSS);
                         ADJUST_ARGS();
-                        RESERVE_SPACE(4 + gm->gm_oid.len);
-                        WRITE32(gm->gm_oid.len);
-                        WRITEMEM(gm->gm_oid.data, gm->gm_oid.len);
+                        RESERVE_SPACE(4 + info.oid.len);
+                        WRITE32(info.oid.len);
+                        WRITEMEM(info.oid.data, info.oid.len);
                         ADJUST_ARGS();
                         RESERVE_SPACE(4);
-                        WRITE32(0); /* qop */
+                        WRITE32(info.qop);
                         ADJUST_ARGS();
                         RESERVE_SPACE(4);
-                        WRITE32(gss_pseudoflavor_to_service(gm, flav));
+                        WRITE32(info.service);
                         ADJUST_ARGS();
-                        gss_mech_put(gm);
                 } else {
                         RESERVE_SPACE(4);
-                        WRITE32(flav);
+                        WRITE32(flavs[i].pseudoflavor);
                         ADJUST_ARGS();
                 }
         }
+
 out:
         if (exp)
                 exp_put(exp);