use local access checks when NQNFS ACCESS check cannot be used to server

[unix-history] / usr / src / sys / nfs / nfs_bio.c

diff --git a/usr/src/sys/nfs/nfs_bio.c b/usr/src/sys/nfs/nfs_bio.c
index 5bdd5b4..a970fa1 100644 (file)
--- a/usr/src/sys/nfs/nfs_bio.c
+++ b/usr/src/sys/nfs/nfs_bio.c
@@ -7,10 +7,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_bio.c   7.28 (Berkeley) %G%
+ *     @(#)nfs_bio.c   7.35 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>

+#include <sys/systm.h>

 #include <sys/resourcevar.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/resourcevar.h>
 #include <sys/proc.h>
 #include <sys/buf.h>


@@ -18,8 +19,9 @@
 #include <sys/trace.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/trace.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>

-#include <machine/endian.h>
+

 #include <vm/vm.h>
 #include <vm/vm.h>

+

 #include <nfs/nfsnode.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsv2.h>
 #include <nfs/nfsnode.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsv2.h>


@@ -41,7 +43,6 @@ nfs_bioread(vp, uio, ioflag, cred)
        int ioflag;
        struct ucred *cred;
 {
        int ioflag;
        struct ucred *cred;
 {

-       USES_VOP_GETATTR;

        register struct nfsnode *np = VTONFS(vp);
        register int biosize;
        struct buf *bp;
        register struct nfsnode *np = VTONFS(vp);
        register int biosize;
        struct buf *bp;


@@ -85,10 +86,9 @@ nfs_bioread(vp, uio, ioflag, cred)
         */
        if ((nmp->nm_flag & NFSMNT_NQNFS) == 0 && vp->v_type != VLNK) {
                if (np->n_flag & NMODIFIED) {
         */
        if ((nmp->nm_flag & NFSMNT_NQNFS) == 0 && vp->v_type != VLNK) {
                if (np->n_flag & NMODIFIED) {

-                       np->n_flag &= ~NMODIFIED;

                        if ((nmp->nm_flag & NFSMNT_MYWRITE) == 0 ||
                             vp->v_type != VREG)
                        if ((nmp->nm_flag & NFSMNT_MYWRITE) == 0 ||
                             vp->v_type != VREG)

-                               vinvalbuf(vp, TRUE, cred, uio->uio_procp);
+                               NFS_VINVBUF(np, vp, TRUE, cred, uio->uio_procp);

                        np->n_attrstamp = 0;
                        np->n_direofoffset = 0;
                        if (error = VOP_GETATTR(vp, &vattr, cred, uio->uio_procp))
                        np->n_attrstamp = 0;
                        np->n_direofoffset = 0;
                        if (error = VOP_GETATTR(vp, &vattr, cred, uio->uio_procp))


@@ -99,7 +99,7 @@ nfs_bioread(vp, uio, ioflag, cred)
                                return (error);
                        if (np->n_mtime != vattr.va_mtime.ts_sec) {
                                np->n_direofoffset = 0;
                                return (error);
                        if (np->n_mtime != vattr.va_mtime.ts_sec) {
                                np->n_direofoffset = 0;

-                               vinvalbuf(vp, TRUE, cred, uio->uio_procp);
+                               NFS_VINVBUF(np, vp, TRUE, cred, uio->uio_procp);

                                np->n_mtime = vattr.va_mtime.ts_sec;
                        }
                }
                                np->n_mtime = vattr.va_mtime.ts_sec;
                        }
                }


@@ -122,8 +122,7 @@ nfs_bioread(vp, uio, ioflag, cred)
                                np->n_direofoffset = 0;
                                cache_purge(vp);
                        }
                                np->n_direofoffset = 0;
                                cache_purge(vp);
                        }

-                       np->n_flag &= ~NMODIFIED;
-                       vinvalbuf(vp, TRUE, cred, uio->uio_procp);
+                       NFS_VINVBUF(np, vp, TRUE, cred, uio->uio_procp);

                        np->n_brev = np->n_lrev;
                }
            }
                        np->n_brev = np->n_lrev;
                }
            }


@@ -146,7 +145,7 @@ nfs_bioread(vp, uio, ioflag, cred)
                nfsstats.biocache_reads++;
                lbn = uio->uio_offset / biosize;
                on = uio->uio_offset & (biosize-1);
                nfsstats.biocache_reads++;
                lbn = uio->uio_offset / biosize;
                on = uio->uio_offset & (biosize-1);

-               n = MIN((unsigned)(biosize - on), uio->uio_resid);
+               n = min((unsigned)(biosize - on), uio->uio_resid);

                diff = np->n_size - uio->uio_offset;
                if (diff <= 0)
                        return (error);
                diff = np->n_size - uio->uio_offset;
                if (diff <= 0)
                        return (error);


@@ -183,20 +182,21 @@ again:
                if (bp->b_resid) {
                   diff = (on >= (biosize-bp->b_resid)) ? 0 :
                        (biosize-bp->b_resid-on);
                if (bp->b_resid) {
                   diff = (on >= (biosize-bp->b_resid)) ? 0 :
                        (biosize-bp->b_resid-on);

-                  n = MIN(n, diff);
+                  n = min(n, diff);

                }
                break;
            case VLNK:
                nfsstats.biocache_readlinks++;
                on = 0;
                error = bread(vp, (daddr_t)0, NFS_MAXPATHLEN, cred, &bp);
                }
                break;
            case VLNK:
                nfsstats.biocache_readlinks++;
                on = 0;
                error = bread(vp, (daddr_t)0, NFS_MAXPATHLEN, cred, &bp);

-               n = MIN(uio->uio_resid, NFS_MAXPATHLEN - bp->b_resid);
+               n = min(uio->uio_resid, NFS_MAXPATHLEN - bp->b_resid);

                break;
            case VDIR:
                nfsstats.biocache_readdirs++;
                on = 0;
                break;
            case VDIR:
                nfsstats.biocache_readdirs++;
                on = 0;

-               error = bread(vp, uio->uio_offset, NFS_DIRBLKSIZ, cred, &bp);
-               n = MIN(uio->uio_resid, NFS_DIRBLKSIZ - bp->b_resid);
+               error = bread(vp, (daddr_t)uio->uio_offset, NFS_DIRBLKSIZ,
+                   cred, &bp);
+               n = min(uio->uio_resid, NFS_DIRBLKSIZ - bp->b_resid);

                break;
            };
            if (error) {
                break;
            };
            if (error) {


@@ -229,8 +229,7 @@ again:
                                        cache_purge(vp);
                                }
                                brelse(bp);
                                        cache_purge(vp);
                                }
                                brelse(bp);

-                               np->n_flag &= ~NMODIFIED;
-                               vinvalbuf(vp, TRUE, cred, uio->uio_procp);
+                               NFS_VINVBUF(np, vp, TRUE, cred, uio->uio_procp);

                                np->n_brev = np->n_lrev;
                                continue;
                        }
                                np->n_brev = np->n_lrev;
                                continue;
                        }


@@ -238,8 +237,7 @@ again:
                    ((np->n_flag & NMODIFIED) && vp->v_type == VDIR)) {
                        np->n_direofoffset = 0;
                        brelse(bp);
                    ((np->n_flag & NMODIFIED) && vp->v_type == VDIR)) {
                        np->n_direofoffset = 0;
                        brelse(bp);

-                       np->n_flag &= ~NMODIFIED;
-                       vinvalbuf(vp, TRUE, cred, uio->uio_procp);
+                       NFS_VINVBUF(np, vp, TRUE, cred, uio->uio_procp);

                        np->n_brev = np->n_lrev;
                        continue;
                }
                        np->n_brev = np->n_lrev;
                        continue;
                }


@@ -266,7 +264,7 @@ again:
 /*
  * Vnode op for write using bio
  */
 /*
  * Vnode op for write using bio
  */

-nfs_write (ap)
+nfs_write(ap)

        struct vop_write_args /* {
                struct vnode *a_vp;
                struct uio *a_uio;
        struct vop_write_args /* {
                struct vnode *a_vp;
                struct uio *a_uio;


@@ -274,7 +272,6 @@ nfs_write (ap)
                struct ucred *a_cred;
        } */ *ap;
 {
                struct ucred *a_cred;
        } */ *ap;
 {

-       USES_VOP_GETATTR;

        register int biosize;
        register struct uio *uio = ap->a_uio;
        struct proc *p = uio->uio_procp;
        register int biosize;
        register struct uio *uio = ap->a_uio;
        struct proc *p = uio->uio_procp;


@@ -302,8 +299,8 @@ nfs_write (ap)
        }
        if (ioflag & (IO_APPEND | IO_SYNC)) {
                if (np->n_flag & NMODIFIED) {
        }
        if (ioflag & (IO_APPEND | IO_SYNC)) {
                if (np->n_flag & NMODIFIED) {

-                       np->n_flag &= ~NMODIFIED;
-                       vinvalbuf(vp, TRUE, cred, p);
+                       np->n_attrstamp = 0;
+                       NFS_VINVBUF(np, vp, TRUE, cred, p);

                }
                if (ioflag & IO_APPEND) {
                        np->n_attrstamp = 0;
                }
                if (ioflag & IO_APPEND) {
                        np->n_attrstamp = 0;


@@ -348,16 +345,16 @@ nfs_write (ap)
                                return (error);
                        if (np->n_lrev != np->n_brev ||
                            (np->n_flag & NQNFSNONCACHE)) {
                                return (error);
                        if (np->n_lrev != np->n_brev ||
                            (np->n_flag & NQNFSNONCACHE)) {

-                               vinvalbuf(vp, TRUE, cred, p);
+                               NFS_VINVBUF(np, vp, TRUE, cred, p);

                                np->n_brev = np->n_lrev;
                        }
                }
                if (np->n_flag & NQNFSNONCACHE)
                                np->n_brev = np->n_lrev;
                        }
                }
                if (np->n_flag & NQNFSNONCACHE)

-                       return (nfs_writerpc(vp, uio, cred));
+                       return (nfs_writerpc(vp, uio, cred, 0));

                nfsstats.biocache_writes++;
                lbn = uio->uio_offset / biosize;
                on = uio->uio_offset & (biosize-1);
                nfsstats.biocache_writes++;
                lbn = uio->uio_offset / biosize;
                on = uio->uio_offset & (biosize-1);

-               n = MIN((unsigned)(biosize - on), uio->uio_resid);
+               n = min((unsigned)(biosize - on), uio->uio_resid);

                if (uio->uio_offset + n > np->n_size) {
                        np->n_size = uio->uio_offset + n;
                        vnode_pager_setsize(vp, (u_long)np->n_size);
                if (uio->uio_offset + n > np->n_size) {
                        np->n_size = uio->uio_offset + n;
                        vnode_pager_setsize(vp, (u_long)np->n_size);


@@ -398,8 +395,10 @@ again:
                        }
                        if (np->n_lrev != np->n_brev ||
                            (np->n_flag & NQNFSNONCACHE)) {
                        }
                        if (np->n_lrev != np->n_brev ||
                            (np->n_flag & NQNFSNONCACHE)) {

-                               vinvalbuf(vp, TRUE, cred, p);
+                               brelse(bp);
+                               NFS_VINVBUF(np, vp, TRUE, cred, p);

                                np->n_brev = np->n_lrev;
                                np->n_brev = np->n_lrev;

+                               goto again;

                        }
                }
                if (error = uiomove(bp->b_un.b_addr + on, n, uio)) {
                        }
                }
                if (error = uiomove(bp->b_un.b_addr + on, n, uio)) {


@@ -407,8 +406,8 @@ again:
                        return (error);
                }
                if (bp->b_dirtyend > 0) {
                        return (error);
                }
                if (bp->b_dirtyend > 0) {

-                       bp->b_dirtyoff = MIN(on, bp->b_dirtyoff);
-                       bp->b_dirtyend = MAX((on+n), bp->b_dirtyend);
+                       bp->b_dirtyoff = min(on, bp->b_dirtyoff);
+                       bp->b_dirtyend = max((on+n), bp->b_dirtyend);

                } else {
                        bp->b_dirtyoff = on;
                        bp->b_dirtyend = on+n;
                } else {
                        bp->b_dirtyoff = on;
                        bp->b_dirtyend = on+n;


@@ -418,8 +417,8 @@ again:
                        bp->b_validoff = bp->b_dirtyoff;
                        bp->b_validend = bp->b_dirtyend;
                } else {
                        bp->b_validoff = bp->b_dirtyoff;
                        bp->b_validend = bp->b_dirtyend;
                } else {

-                       bp->b_validoff = MIN(bp->b_validoff, bp->b_dirtyoff);
-                       bp->b_validend = MAX(bp->b_validend, bp->b_dirtyend);
+                       bp->b_validoff = min(bp->b_validoff, bp->b_dirtyoff);
+                       bp->b_validend = max(bp->b_validend, bp->b_dirtyend);

                }
 
                /*
                }
 
                /*