xnu-344.tar.gz

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

diff --git a/bsd/nfs/nfs_syscalls.c b/bsd/nfs/nfs_syscalls.c
index 41f1333ad94a8771b2f8b099bd513fb96005ceba..852257d439184f97c4e61d62fe10a5618e634853 100644 (file)
--- a/bsd/nfs/nfs_syscalls.c
+++ b/bsd/nfs/nfs_syscalls.c
@@ -850,7 +850,7 @@ nfssvc_iod(p)
        /* stuff myiod into uthread to get off local stack for
        continuation */
 
        /* stuff myiod into uthread to get off local stack for
        continuation */
 

-       ut = get_bsdthread_info(current_act());
+       ut = (struct uthread *)get_bsdthread_info(current_act());

        ut->uu_state.uu_nfs_myiod = myiod;  /* squirrel away for continuation */
 
        nfssvc_iod_continue(0);
        ut->uu_state.uu_nfs_myiod = myiod;  /* squirrel away for continuation */
 
        nfssvc_iod_continue(0);


@@ -873,7 +873,7 @@ nfssvc_iod_continue(error)
        /*
         * real myiod is stored in uthread, recover it
         */
        /*
         * real myiod is stored in uthread, recover it
         */

-       ut = get_bsdthread_info(current_act());
+       ut = (struct uthread *)get_bsdthread_info(current_act());

        myiod = ut->uu_state.uu_nfs_myiod;
        p = current_proc();
 
        myiod = ut->uu_state.uu_nfs_myiod;
        p = current_proc();
 


@@ -901,11 +901,7 @@ nfssvc_iod_continue(error)
                nfs_numasync--;
                if (error == EINTR || error == ERESTART)
                  error = 0;
                nfs_numasync--;
                if (error == EINTR || error == ERESTART)
                  error = 0;

-#if defined (__i386__)
-               return(error);
-#else

                unix_syscall_return(error);
                unix_syscall_return(error);

-#endif

            }
            while ((bp = nmp->nm_bufq.tqh_first) != NULL) {
                /* Take one off the front of the list */
            }
            while ((bp = nmp->nm_bufq.tqh_first) != NULL) {
                /* Take one off the front of the list */