diff options
| author | Anton Altaparmakov <aia21@cam.ac.uk> | 2002-04-06 17:06:56 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@drop.stormcorp.org> | 2002-04-06 17:06:56 +0100 |
| commit | 95015ed064d9e6c4e8594e2a85f7f3ff6236b0a1 (patch) | |
| tree | a3ab75166d13d3bcc017c23f3a49d60526e199bb /include/linux/fs.h | |
| parent | fbc5dabd779e42ab0c01542871f365bec395d80f (diff) | |
| parent | cbba4f5ef5c3298451d51aca1b74ad0040ff9c5a (diff) | |
Merge cam.ac.uk:/rain/usr/src/bklinux-2.5 into cam.ac.uk:/usr/src/tng
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 375d53dd69e9..2031f5cbde19 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -650,7 +650,6 @@ struct quota_mount_options #include <linux/ufs_fs_sb.h> #include <linux/romfs_fs_sb.h> #include <linux/adfs_fs_sb.h> -#include <linux/reiserfs_fs_sb.h> #include <linux/bfs_fs_sb.h> extern struct list_head super_blocks; @@ -663,6 +662,7 @@ struct super_block { kdev_t s_dev; unsigned long s_blocksize; unsigned char s_blocksize_bits; + unsigned long s_old_blocksize; unsigned char s_dirt; unsigned long long s_maxbytes; /* Max file size */ struct file_system_type *s_type; @@ -693,7 +693,6 @@ struct super_block { struct ufs_sb_info ufs_sb; struct romfs_sb_info romfs_sb; struct adfs_sb_info adfs_sb; - struct reiserfs_sb_info reiserfs_sb; struct bfs_sb_info bfs_sb; void *generic_sbp; } u; |