diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-03-19 12:34:39 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-03-19 12:35:05 -0400 |
commit | 62b9510cb373d5722fdaba71d961d8f695acfcd5 (patch) | |
tree | 5a16a206a7e1aac18b96bed26f21ebbe15605fa6 /include | |
parent | 8546ee518c6662ddb3075249fb31d89e5dbfb7d5 (diff) | |
parent | 06effdbb49af5f6c7d20affaec74603914acc768 (diff) | |
download | linux-62b9510cb373d5722fdaba71d961d8f695acfcd5.tar.gz |
nfsd: merge cookie collision fixes from ext4 tree
These changes fix readdir loops on ext4 filesystems with dir_index
turned on. I'm pulling them from Ted's tree as I'd like to give them
some extra nfsd testing, and expect to be applying (potentially
conflicting) patches to the same code before the next merge window.
From the nfs-ext4-premerge branch of
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 386da09f229d..8975a5602931 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -92,6 +92,10 @@ struct inodes_stat_t { /* File is opened using open(.., 3, ..) and is writeable only for ioctls (specialy hack for floppy.c) */ #define FMODE_WRITE_IOCTL ((__force fmode_t)0x100) +/* 32bit hashes as llseek() offset (for directories) */ +#define FMODE_32BITHASH ((__force fmode_t)0x200) +/* 64bit hashes as llseek() offset (for directories) */ +#define FMODE_64BITHASH ((__force fmode_t)0x400) /* * Don't update ctime and mtime. |