use readip1()

SCCS-vsn: sys/kern/vfs_syscalls.c 4.33
SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 4.33
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 4.33
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 4.33
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 4.33

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index b8de1e6..cfbdb27 100644 (file)
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*     vfs_syscalls.c  4.32    82/08/10        */
+/*     vfs_syscalls.c  4.33    82/08/14        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -535,11 +535,7 @@ readlink()
                goto out;
        }
        uap = (struct a *)u.u_ap;
                goto out;
        }
        uap = (struct a *)u.u_ap;

-       u.u_offset = 0;
-       u.u_base = uap->buf;
-       u.u_count = uap->count;
-       u.u_segflg = 0;
-       readi(ip);
+       u.u_error = readip1(ip, uap->buf, uap->count, 0, 0, 0);

 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;
 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index dc2f996..bc6bade 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -1,4 +1,4 @@
-/*     ffs_vnops.c     4.32    82/08/10        */
+/*     ffs_vnops.c     4.33    82/08/14        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -535,11 +535,7 @@ readlink()
                goto out;
        }
        uap = (struct a *)u.u_ap;
                goto out;
        }
        uap = (struct a *)u.u_ap;

-       u.u_offset = 0;
-       u.u_base = uap->buf;
-       u.u_count = uap->count;
-       u.u_segflg = 0;
-       readi(ip);
+       u.u_error = readip1(ip, uap->buf, uap->count, 0, 0, 0);

 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;
 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 5c24982..1f69d28 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*     ufs_vnops.c     4.32    82/08/10        */
+/*     ufs_vnops.c     4.33    82/08/14        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -535,11 +535,7 @@ readlink()
                goto out;
        }
        uap = (struct a *)u.u_ap;
                goto out;
        }
        uap = (struct a *)u.u_ap;

-       u.u_offset = 0;
-       u.u_base = uap->buf;
-       u.u_count = uap->count;
-       u.u_segflg = 0;
-       readi(ip);
+       u.u_error = readip1(ip, uap->buf, uap->count, 0, 0, 0);

 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;
 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index 08e3b69..ede00d7 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -1,4 +1,4 @@
-/*     lfs_vnops.c     4.32    82/08/10        */
+/*     lfs_vnops.c     4.33    82/08/14        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -535,11 +535,7 @@ readlink()
                goto out;
        }
        uap = (struct a *)u.u_ap;
                goto out;
        }
        uap = (struct a *)u.u_ap;

-       u.u_offset = 0;
-       u.u_base = uap->buf;
-       u.u_count = uap->count;
-       u.u_segflg = 0;
-       readi(ip);
+       u.u_error = readip1(ip, uap->buf, uap->count, 0, 0, 0);

 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;
 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 5c24982..1f69d28 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*     ufs_vnops.c     4.32    82/08/10        */
+/*     ufs_vnops.c     4.33    82/08/14        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -535,11 +535,7 @@ readlink()
                goto out;
        }
        uap = (struct a *)u.u_ap;
                goto out;
        }
        uap = (struct a *)u.u_ap;

-       u.u_offset = 0;
-       u.u_base = uap->buf;
-       u.u_count = uap->count;
-       u.u_segflg = 0;
-       readi(ip);
+       u.u_error = readip1(ip, uap->buf, uap->count, 0, 0, 0);

 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;
 out:
        iput(ip);
        u.u_r.r_val1 = uap->count - u.u_count;