On Mon, Mar 05, 2012 at 07:08:37PM -0500, Ted Ts'o wrote: > On Mon, Jan 09, 2012 at 02:21:53PM +0100, Bernd Schubert wrote: > > Just rename this variable, as the next patch will add a flag and > > 'access' as variable name would not be correct any more. > > > > Signed-off-by: Bernd Schubert <bernd.schubert@xxxxxxxxxxxxxxxxxx> > > Acked-by: J. Bruce Fields<bfields@xxxxxxxxxx> > > --- > > fs/nfsd/vfs.c | 18 ++++++++++-------- > > 1 files changed, 10 insertions(+), 8 deletions(-) > > On Mon, Jan 09, 2012 at 02:21:58PM +0100, Bernd Schubert wrote: > > Use 32-bit or 64-bit llseek() hashes for directory offsets depending on > > the NFS version. NFSv2 gets 32-bit hashes only. > > > > NOTE: This patch got rather complex as Christoph asked to set the > > filp->f_mode flag in the open call or immediatly after dentry_open() > > in nfsd_open() to avoid races. > > Personally I still do not see a reason for that and in my opinion > > FMODE_32BITHASH/FMODE_64BITHASH flags could be set nfsd_readdir(), as it > > follows directly after nfsd_open() without a chance of races. > > > > Signed-off-by: Bernd Schubert <bernd.schubert@xxxxxxxxxxxxxxxxxx> > > Acked-by: J. Bruce Fields<bfields@xxxxxxxxxx> > > --- > > fs/nfsd/vfs.c | 15 +++++++++++++-- > > fs/nfsd/vfs.h | 2 ++ > > 2 files changed, 15 insertions(+), 2 deletions(-) > > NFS folks, > > Since Bruce has ack'ed these patches I assume it will be OK if I carry > them in the ext4 tree for merging? (They depend on changes in ext4 > found in the first two patches of these patch series.) Yes, that would be fine. (There may well be some conflict: simplest might be if you can get that pushed out to a stable public branch somewhere, hopefully before the merge window opens, and that'll give me a chance to pull it and handle any merge conflicts. Then as long as your initial pull request goes in early (so that the ext4 changes don't get sucked in with mine), everything works.) --b. -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html