Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c4d3901 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara
Browse files

ext3: remove vestiges of nobh support 



The nobh option was only supported for writeback mode, but given that all
write paths (except mmapped writed) actually create buffer heads, it
effectively was a no-op already.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 0411ba79

fs/ext3/inode.c

+1 −15
Original line number Diff line number Diff line
@@ -1625,9 +1625,6 @@ static int ext3_writeback_writepage(struct page *page, 
		goto out_fail;

	}



	if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode))

		ret = nobh_writepage(page, ext3_get_block, wbc);

	else

	ret = block_write_full_page(page, ext3_get_block, wbc);



	err = ext3_journal_stop(handle);
@@ -1922,17 +1919,6 @@ static int ext3_block_truncate_page(handle_t *handle, struct page *page, 
	length = blocksize - (offset & (blocksize - 1));

	iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);



	/*

	 * For "nobh" option,  we can only work if we don't need to

	 * read-in the page - otherwise we create buffers to do the IO.

	 */

	if (!page_has_buffers(page) && test_opt(inode->i_sb, NOBH) &&

	     ext3_should_writeback_data(inode) && PageUptodate(page)) {

		zero_user(page, offset, length);

		set_page_dirty(page);

		goto unlock;

	}



	if (!page_has_buffers(page))

		create_empty_buffers(page, blocksize, 0);

fs/ext3/super.c

+4 −13
Original line number Diff line number Diff line
@@ -661,9 +661,6 @@ static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs) 
	 */

	seq_puts(seq, ",barrier=");

	seq_puts(seq, test_opt(sb, BARRIER) ? "1" : "0");

	if (test_opt(sb, NOBH))

		seq_puts(seq, ",nobh");



	seq_printf(seq, ",data=%s", data_mode_string(test_opt(sb, DATA_FLAGS)));

	if (test_opt(sb, DATA_ERR_ABORT))

		seq_puts(seq, ",data_err=abort");
@@ -1255,10 +1252,12 @@ set_qf_format: 
			*n_blocks_count = option;

			break;

		case Opt_nobh:

			set_opt(sbi->s_mount_opt, NOBH);

			ext3_msg(sb, KERN_WARNING,

				"warning: ignoring deprecated nobh option");

			break;

		case Opt_bh:

			clear_opt(sbi->s_mount_opt, NOBH);

			ext3_msg(sb, KERN_WARNING,

				"warning: ignoring deprecated bh option");

			break;

		default:

			ext3_msg(sb, KERN_ERR,
@@ -2001,14 +2000,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
		break;

	}



	if (test_opt(sb, NOBH)) {

		if (!(test_opt(sb, DATA_FLAGS) == EXT3_MOUNT_WRITEBACK_DATA)) {

			ext3_msg(sb, KERN_WARNING,

				"warning: ignoring nobh option - "

				"it is supported only with writeback mode");

			clear_opt(sbi->s_mount_opt, NOBH);

		}

	}

	/*

	 * The journal_load will have done any necessary log recovery,

	 * so we can safely mount the rest of the filesystem now.

include/linux/ext3_fs.h

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ struct ext3_inode { 
#define EXT3_MOUNT_POSIX_ACL		0x08000	/* POSIX Access Control Lists */

#define EXT3_MOUNT_RESERVATION		0x10000	/* Preallocation */

#define EXT3_MOUNT_BARRIER		0x20000 /* Use block barriers */

#define EXT3_MOUNT_NOBH			0x40000 /* No bufferheads */

#define EXT3_MOUNT_QUOTA		0x80000 /* Some quota option set */

#define EXT3_MOUNT_USRQUOTA		0x100000 /* "old" user quota */

#define EXT3_MOUNT_GRPQUOTA		0x200000 /* "old" group quota */