diff options
Diffstat (limited to 'fs/ext3/dir.c')
-rw-r--r-- | fs/ext3/dir.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c index fd4b6dd71150..c8e4ee3af1d0 100644 --- a/fs/ext3/dir.c +++ b/fs/ext3/dir.c | |||
@@ -47,9 +47,7 @@ const struct file_operations ext3_dir_operations = { | |||
47 | .compat_ioctl = ext3_compat_ioctl, | 47 | .compat_ioctl = ext3_compat_ioctl, |
48 | #endif | 48 | #endif |
49 | .fsync = ext3_sync_file, /* BKL held */ | 49 | .fsync = ext3_sync_file, /* BKL held */ |
50 | #ifdef CONFIG_EXT3_INDEX | ||
51 | .release = ext3_release_dir, | 50 | .release = ext3_release_dir, |
52 | #endif | ||
53 | }; | 51 | }; |
54 | 52 | ||
55 | 53 | ||
@@ -107,7 +105,6 @@ static int ext3_readdir(struct file * filp, | |||
107 | 105 | ||
108 | sb = inode->i_sb; | 106 | sb = inode->i_sb; |
109 | 107 | ||
110 | #ifdef CONFIG_EXT3_INDEX | ||
111 | if (EXT3_HAS_COMPAT_FEATURE(inode->i_sb, | 108 | if (EXT3_HAS_COMPAT_FEATURE(inode->i_sb, |
112 | EXT3_FEATURE_COMPAT_DIR_INDEX) && | 109 | EXT3_FEATURE_COMPAT_DIR_INDEX) && |
113 | ((EXT3_I(inode)->i_flags & EXT3_INDEX_FL) || | 110 | ((EXT3_I(inode)->i_flags & EXT3_INDEX_FL) || |
@@ -123,7 +120,6 @@ static int ext3_readdir(struct file * filp, | |||
123 | */ | 120 | */ |
124 | EXT3_I(filp->f_path.dentry->d_inode)->i_flags &= ~EXT3_INDEX_FL; | 121 | EXT3_I(filp->f_path.dentry->d_inode)->i_flags &= ~EXT3_INDEX_FL; |
125 | } | 122 | } |
126 | #endif | ||
127 | stored = 0; | 123 | stored = 0; |
128 | offset = filp->f_pos & (sb->s_blocksize - 1); | 124 | offset = filp->f_pos & (sb->s_blocksize - 1); |
129 | 125 | ||
@@ -232,7 +228,6 @@ out: | |||
232 | return ret; | 228 | return ret; |
233 | } | 229 | } |
234 | 230 | ||
235 | #ifdef CONFIG_EXT3_INDEX | ||
236 | /* | 231 | /* |
237 | * These functions convert from the major/minor hash to an f_pos | 232 | * These functions convert from the major/minor hash to an f_pos |
238 | * value. | 233 | * value. |
@@ -518,5 +513,3 @@ static int ext3_release_dir (struct inode * inode, struct file * filp) | |||
518 | 513 | ||
519 | return 0; | 514 | return 0; |
520 | } | 515 | } |
521 | |||
522 | #endif | ||