lkml.org 
[lkml]   [2008]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [RFC] readdir mess
    PS: the part below was on top of patch from dwmw2; in the mainline the analog
    of that sucker is in XFS.

    > diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
    > index 8291591..77ad3a5 100644
    > --- a/fs/nfsd/vfs.c
    > +++ b/fs/nfsd/vfs.c
    > @@ -1832,6 +1832,7 @@ struct buffered_dirent {
    > struct readdir_data {
    > char *dirent;
    > size_t used;
    > + int full;
    > };
    >
    > static int nfsd_buffered_filldir(void *__buf, const char *name, int namlen,
    > @@ -1842,8 +1843,10 @@ static int nfsd_buffered_filldir(void *__buf, const char *name, int namlen,
    > unsigned int reclen;
    >
    > reclen = ALIGN(sizeof(struct buffered_dirent) + namlen, sizeof(u64));
    > - if (buf->used + reclen > PAGE_SIZE)
    > + if (buf->used + reclen > PAGE_SIZE) {
    > + buf->full = 1;
    > return -EINVAL;
    > + }
    >
    > de->namlen = namlen;
    > de->offset = offset;
    > @@ -1875,9 +1878,13 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func,
    > unsigned int reclen;
    >
    > buf.used = 0;
    > + buf.full = 0;
    >
    > host_err = vfs_readdir(file, nfsd_buffered_filldir, &buf);
    > - if (host_err)
    > + if (buf.full)
    > + host_err = 0;
    > +
    > + if (host_err < 0)
    > break;
    >
    > size = buf.used;


    \
     
     \ /
      Last update: 2008-08-25 03:47    [W:0.022 / U:30.592 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site