d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "not hungly" panics. Cookies now used by the linux and ibcs2

Browse Source 
emulators. The emulators assume that filesystem may just ignore cookies, and
handle this case correctly. So we just ignore cookies.

Also sync *_readdir "prototypes" with reality.
This commit is contained in:
dt 1998-06-25 16:54:41 +00:00
parent 267ffb2428
commit c6c8ca45cd
3 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/fs/procfs/procfs_vnops.c
View File

@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
* $Id: procfs_vnops.c,v 1.58 1998/06/10 06:34:57 peter Exp $
* $Id: procfs_vnops.c,v 1.59 1998/06/14 12:53:39 bde Exp $
*/
/*
@ -799,8 +799,8 @@ procfs_readdir(ap)
struct uio *a_uio;
struct ucred *a_cred;
int *a_eofflag;
u_long *a_cookies;
int a_ncookies;
int *a_ncookies;
u_long **a_cookies;
} */ *ap;
{
struct uio *uio = ap->a_uio;
@ -809,13 +809,6 @@ procfs_readdir(ap)
struct pfsnode *pfs;
int count, error, i, off;
/*
* We don't allow exporting procfs mounts, and currently local
* requests do not need cookies.
*/
if (ap->a_ncookies)
panic("procfs_readdir: not hungry");
pfs = VTOPFS(ap->a_vp);
off = (int)uio->uio_offset;

13
sys/miscfs/kernfs/kernfs_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95
* $Id: kernfs_vnops.c,v 1.32 1998/06/10 21:21:30 dfr Exp $
* $Id: kernfs_vnops.c,v 1.33 1998/06/14 12:34:42 bde Exp $
*/
/*
@ -520,8 +520,8 @@ kernfs_readdir(ap)
struct uio *a_uio;
struct ucred *a_cred;
int *a_eofflag;
u_long *a_cookies;
int a_ncookies;
int *a_ncookies;
u_long **a_cookies;
} */ *ap;
{
int error, i, off;
@ -532,13 +532,6 @@ kernfs_readdir(ap)
if (ap->a_vp->v_type != VDIR)
return (ENOTDIR);
/*
* We don't allow exporting kernfs mounts, and currently local
* requests do not need cookies.
*/
if (ap->a_ncookies != NULL)
panic("kernfs_readdir: not hungry");
off = (int)uio->uio_offset;
if (off != uio->uio_offset || off < 0 || (u_int)off % UIO_MX != 0 ||
uio->uio_resid < UIO_MX)

13
sys/miscfs/procfs/procfs_vnops.c
View File

@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
* $Id: procfs_vnops.c,v 1.58 1998/06/10 06:34:57 peter Exp $
* $Id: procfs_vnops.c,v 1.59 1998/06/14 12:53:39 bde Exp $
*/
/*
@ -799,8 +799,8 @@ procfs_readdir(ap)
struct uio *a_uio;
struct ucred *a_cred;
int *a_eofflag;
u_long *a_cookies;
int a_ncookies;
int *a_ncookies;
u_long **a_cookies;
} */ *ap;
{
struct uio *uio = ap->a_uio;
@ -809,13 +809,6 @@ procfs_readdir(ap)
struct pfsnode *pfs;
int count, error, i, off;
/*
* We don't allow exporting procfs mounts, and currently local
* requests do not need cookies.
*/
if (ap->a_ncookies)
panic("procfs_readdir: not hungry");
pfs = VTOPFS(ap->a_vp);
off = (int)uio->uio_offset;