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/super.c | |
| parent | 5a0790c2c4a18435759a70e1562450035d778339 (diff) | |
| download | kernel_samsung_tuna-206f7ab4f49a2021fcb8687f25395be77711ddee.zip kernel_samsung_tuna-206f7ab4f49a2021fcb8687f25395be77711ddee.tar.gz kernel_samsung_tuna-206f7ab4f49a2021fcb8687f25395be77711ddee.tar.bz2 | |
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/super.c')
| -rw-r--r-- | fs/ext4/super.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 4e8983a..422a4ce 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -946,8 +946,6 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs) seq_puts(seq, ",journal_async_commit"); else if (test_opt(sb, JOURNAL_CHECKSUM)) seq_puts(seq, ",journal_checksum"); - if (test_opt(sb, NOBH)) - seq_puts(seq, ",nobh"); if (test_opt(sb, I_VERSION)) seq_puts(seq, ",i_version"); if (!test_opt(sb, DELALLOC)) @@ -1624,10 +1622,12 @@ set_qf_format: *n_blocks_count = option; break; case Opt_nobh: - set_opt(sbi->s_mount_opt, NOBH); + ext4_msg(sb, KERN_WARNING, + "Ignoring deprecated nobh option"); break; case Opt_bh: - clear_opt(sbi->s_mount_opt, NOBH); + ext4_msg(sb, KERN_WARNING, + "Ignoring deprecated bh option"); break; case Opt_i_version: set_opt(sbi->s_mount_opt, I_VERSION); @@ -2912,18 +2912,7 @@ no_journal: ext4_msg(sb, KERN_ERR, "insufficient memory"); goto failed_mount_wq; } - if (test_opt(sb, NOBH)) { - if (!(test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_WRITEBACK_DATA)) { - ext4_msg(sb, KERN_WARNING, "Ignoring nobh option - " - "its supported only with writeback mode"); - clear_opt(sbi->s_mount_opt, NOBH); - } - if (test_opt(sb, DIOREAD_NOLOCK)) { - ext4_msg(sb, KERN_WARNING, "dioread_nolock option is " - "not supported with nobh mode"); - goto failed_mount_wq; - } - } + EXT4_SB(sb)->dio_unwritten_wq = create_workqueue("ext4-dio-unwritten"); if (!EXT4_SB(sb)->dio_unwritten_wq) { printk(KERN_ERR "EXT4-fs: failed to create DIO workqueue\n"); |