From: Al Viro Subject: Re: [RFC] readdir mess Date: Mon, 25 Aug 2008 02:44:36 +0100 Message-ID: <20080825014436.GT28946@ZenIV.linux.org.uk> References: <20080812203808.GV28946@ZenIV.linux.org.uk> <20080813000433.GZ28946@ZenIV.linux.org.uk> <20080815050613.GJ4422@cs.cmu.edu> <20080824101014.GN28946@ZenIV.linux.org.uk> <20080824195908.GQ28946@ZenIV.linux.org.uk> <20080825013316.GR28946@ZenIV.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jan Harkes , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: Linus Torvalds Return-path: Received: from zeniv.linux.org.uk ([195.92.253.2]:39809 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753219AbYHYBoj (ORCPT ); Sun, 24 Aug 2008 21:44:39 -0400 Content-Disposition: inline In-Reply-To: <20080825013316.GR28946@ZenIV.linux.org.uk> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: 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;