Fixed BZ1100813 by fixing build errors in nfsd.stp.

* tapset/linux/nfsd.stp (__rqstp_uid): Fix pointer casting, needed by
  32-bit platforms.
  (__rqstp_gid): Ditto.

diff --git a/tapset/linux/nfsd.stp b/tapset/linux/nfsd.stp
index f6eb650c9c5877259be6586ec345ac86a057815a..701a81df359343f94fe7ddedfc4e8f140b8fcbc4 100644 (file)
--- a/tapset/linux/nfsd.stp
+++ b/tapset/linux/nfsd.stp
@@ -40,7 +40,7 @@
 
 /*Get file handler from struct svc_fh */
 function __svc_fh:string(fh :long) %{  /* pure */
-       struct svc_fh * fhp = (struct svc_fh *) (long)(STAP_ARG_fh);
+       struct svc_fh * fhp = (struct svc_fh *) (unsigned long)(STAP_ARG_fh);
        struct knfsd_fh *fh = &fhp->fh_handle;
 
        snprintf(STAP_RETVALUE, MAXSTRINGLEN,
@@ -154,7 +154,7 @@ function __rqstp_uid:long(rqstp:long)
        # net/sunrpc/auth_generic.c.
        return %{ /* pure */
                  from_kuid_munged(&init_user_ns,
-                                  ((struct svc_rqst *)STAP_ARG_rqstp)->rq_cred.cr_uid) %}
+                                  ((struct svc_rqst *)(unsigned long)STAP_ARG_rqstp)->rq_cred.cr_uid) %}
 %:
        return @cast(rqstp, "svc_rqst", "kernel:nfsd")->rq_cred->cr_uid
 %)
@@ -168,7 +168,7 @@ function __rqstp_gid:long(rqstp:long)
        # net/sunrpc/auth_generic.c.
        return %{ /* pure */
                  from_kgid_munged(&init_user_ns,
-                                  ((struct svc_rqst *)STAP_ARG_rqstp)->rq_cred.cr_gid) %}
+                                  ((struct svc_rqst *)(unsigned long)STAP_ARG_rqstp)->rq_cred.cr_gid) %}
 %:
        return @cast(rqstp, "svc_rqst", "kernel:nfsd")->rq_cred->cr_gid
 %)