diff options
author | Christoph Hellwig <hch@lst.de> | 2010-06-14 14:42:49 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2010-06-14 14:42:49 -0400 |
commit | 206f7ab4f49a2021fcb8687f25395be77711ddee (patch) | |
tree | 19764d36a25ec1e088d32572a1c0936eeaf19636 /fs/ext4/ext4_jbd2.h | |
parent | 5a0790c2c4a18435759a70e1562450035d778339 (diff) |
ext4: remove vestiges of nobh support
The nobh option was only supported for writeback mode, but given that all
write paths actually create buffer heads it effectively was a no-op already.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ext4_jbd2.h')
-rw-r--r-- | fs/ext4/ext4_jbd2.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h index 8ae8168900bf..38d1e66e5843 100644 --- a/fs/ext4/ext4_jbd2.h +++ b/fs/ext4/ext4_jbd2.h | |||
@@ -313,17 +313,15 @@ static inline int ext4_should_writeback_data(struct inode *inode) | |||
313 | * This function controls whether or not we should try to go down the | 313 | * This function controls whether or not we should try to go down the |
314 | * dioread_nolock code paths, which makes it safe to avoid taking | 314 | * dioread_nolock code paths, which makes it safe to avoid taking |
315 | * i_mutex for direct I/O reads. This only works for extent-based | 315 | * i_mutex for direct I/O reads. This only works for extent-based |
316 | * files, and it doesn't work for nobh or if data journaling is | 316 | * files, and it doesn't work if data journaling is enabled, since the |
317 | * enabled, since the dioread_nolock code uses b_private to pass | 317 | * dioread_nolock code uses b_private to pass information back to the |
318 | * information back to the I/O completion handler, and this conflicts | 318 | * I/O completion handler, and this conflicts with the jbd's use of |
319 | * with the jbd's use of b_private. | 319 | * b_private. |
320 | */ | 320 | */ |
321 | static inline int ext4_should_dioread_nolock(struct inode *inode) | 321 | static inline int ext4_should_dioread_nolock(struct inode *inode) |
322 | { | 322 | { |
323 | if (!test_opt(inode->i_sb, DIOREAD_NOLOCK)) | 323 | if (!test_opt(inode->i_sb, DIOREAD_NOLOCK)) |
324 | return 0; | 324 | return 0; |
325 | if (test_opt(inode->i_sb, NOBH)) | ||
326 | return 0; | ||
327 | if (!S_ISREG(inode->i_mode)) | 325 | if (!S_ISREG(inode->i_mode)) |
328 | return 0; | 326 | return 0; |
329 | if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) | 327 | if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) |