xnu-1504.3.12.tar.gz

[apple/xnu.git] / bsd / nfs / nfs_srvcache.c

diff --git a/bsd/nfs/nfs_srvcache.c b/bsd/nfs/nfs_srvcache.c
index 1b28bdcfb270675a1efcf9a9de30bcf958209c39..db1c6e6a7deacd5188d8b1ca3f2ca7baab2850b7 100644 (file)
--- a/bsd/nfs/nfs_srvcache.c
+++ b/bsd/nfs/nfs_srvcache.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -247,10 +247,10 @@ loop:
                        if (rp->rc_state == RC_UNUSED)
                                panic("nfsrv cache");
                        if (rp->rc_state == RC_INPROG) {
                        if (rp->rc_state == RC_UNUSED)
                                panic("nfsrv cache");
                        if (rp->rc_state == RC_INPROG) {

-                               OSAddAtomic(1, (SInt32*)&nfsstats.srvcache_inproghits);
+                               OSAddAtomic(1, &nfsstats.srvcache_inproghits);

                                ret = RC_DROPIT;
                        } else if (rp->rc_flag & RC_REPSTATUS) {
                                ret = RC_DROPIT;
                        } else if (rp->rc_flag & RC_REPSTATUS) {

-                               OSAddAtomic(1, (SInt32*)&nfsstats.srvcache_nonidemdonehits);
+                               OSAddAtomic(1, &nfsstats.srvcache_nonidemdonehits);

                                nd->nd_repstat = rp->rc_status;
                                error = nfsrv_rephead(nd, slp, &nmrep, 0);
                                if (error) {
                                nd->nd_repstat = rp->rc_status;
                                error = nfsrv_rephead(nd, slp, &nmrep, 0);
                                if (error) {


@@ -262,7 +262,7 @@ loop:
                                        *mrepp = nmrep.nmc_mhead;
                                }
                        } else if (rp->rc_flag & RC_REPMBUF) {
                                        *mrepp = nmrep.nmc_mhead;
                                }
                        } else if (rp->rc_flag & RC_REPMBUF) {

-                               OSAddAtomic(1, (SInt32*)&nfsstats.srvcache_nonidemdonehits);
+                               OSAddAtomic(1, &nfsstats.srvcache_nonidemdonehits);

                                error = mbuf_copym(rp->rc_reply, 0, MBUF_COPYALL, MBUF_WAITOK, mrepp);
                                if (error) {
                                        printf("nfsrv cache: reply copym failed for nonidem request hit\n");
                                error = mbuf_copym(rp->rc_reply, 0, MBUF_COPYALL, MBUF_WAITOK, mrepp);
                                if (error) {
                                        printf("nfsrv cache: reply copym failed for nonidem request hit\n");


@@ -271,7 +271,7 @@ loop:
                                        ret = RC_REPLY;
                                }
                        } else {
                                        ret = RC_REPLY;
                                }
                        } else {

-                               OSAddAtomic(1, (SInt32*)&nfsstats.srvcache_idemdonehits);
+                               OSAddAtomic(1, &nfsstats.srvcache_idemdonehits);

                                rp->rc_state = RC_INPROG;
                                ret = RC_DOIT;
                        }
                                rp->rc_state = RC_INPROG;
                                ret = RC_DOIT;
                        }


@@ -284,7 +284,7 @@ loop:
                        return (ret);
                }
        }
                        return (ret);
                }
        }

-       OSAddAtomic(1, (SInt32*)&nfsstats.srvcache_misses);
+       OSAddAtomic(1, &nfsstats.srvcache_misses);

        if (nfsrv_reqcache_count < nfsrv_reqcache_size) {
                /* try to allocate a new entry */
                MALLOC(rp, struct nfsrvcache *, sizeof *rp, M_NFSD, M_WAITOK);
        if (nfsrv_reqcache_count < nfsrv_reqcache_size) {
                /* try to allocate a new entry */
                MALLOC(rp, struct nfsrvcache *, sizeof *rp, M_NFSD, M_WAITOK);