mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-04 09:09:56 +00:00
Remove "not hungly" panics. Cookies now used by the linux and ibcs2
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:
parent
b62591052c
commit
6bfc1a02b1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=37154
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user