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

Commit 69e1aadd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 updates for 3.4 from Ted Ts'o:
 "Ext4 commits for 3.3 merge window; mostly cleanups and bug fixes

  The changes to export dirty_writeback_interval are from Artem's s_dirt
  cleanup patch series.  The same is true of the change to remove the
  s_dirt helper functions which never got used by anyone in-tree.  I've
  run these changes by Al Viro, and am carrying them so that Artem can
  more easily fix up the rest of the file systems during the next merge
  window.  (Originally we had hopped to remove the use of s_dirt from
  ext4 during this merge window, but his patches had some bugs, so I
  ultimately ended dropping them from the ext4 tree.)"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (66 commits)
  vfs: remove unused superblock helpers
  mm: export dirty_writeback_interval
  ext4: remove useless s_dirt assignment
  ext4: write superblock only once on unmount
  ext4: do not mark superblock as dirty unnecessarily
  ext4: correct ext4_punch_hole return codes
  ext4: remove restrictive checks for EOFBLOCKS_FL
  ext4: always set then trimmed blocks count into len
  ext4: fix trimmed block count accunting
  ext4: fix start and len arguments handling in ext4_trim_fs()
  ext4: update s_free_{inodes,blocks}_count during online resize
  ext4: change some printk() calls to use ext4_msg() instead
  ext4: avoid output message interleaving in ext4_error_<foo>()
  ext4: remove trailing newlines from ext4_msg() and ext4_error() messages
  ext4: add no_printk argument validation, fix fallout
  ext4: remove redundant "EXT4-fs: " from uses of ext4_msg
  ext4: give more helpful error message in ext4_ext_rm_leaf()
  ext4: remove unused code from ext4_ext_map_blocks()
  ext4: rewrite punch hole to use ext4_ext_remove_space()
  jbd2: cleanup journal tail after transaction commit
  ...
parents 56b59b42 9d547c35

Documentation/filesystems/ext4.txt

+0 −8
Original line number Diff line number Diff line
@@ -144,9 +144,6 @@ journal_async_commit Commit block can be written to disk without waiting 
			mount the device. This will enable 'journal_checksum'

			internally.



journal=update		Update the ext4 file system's journal to the current

			format.



journal_dev=devnum	When the external journal device's major/minor numbers

			have changed, this option allows the user to specify

			the new journal location.  The journal device is
@@ -356,11 +353,6 @@ nouid32 Disables 32-bit UIDs and GIDs. This is for 
			interoperability  with  older kernels which only

			store and expect 16-bit values.



resize			Allows to resize filesystem to the end of the last

			existing block group, further resize has to be done

			with resize2fs either online, or offline. It can be

			used only with conjunction with remount.



block_validity		This options allows to enables/disables the in-kernel

noblock_validity	facility for tracking filesystem metadata blocks

			within internal data structures. This allows multi-

fs/ext4/balloc.c

+44 −19
Original line number Diff line number Diff line
@@ -336,10 +336,10 @@ err_out: 
 * Return buffer_head on success or NULL in case of failure.

 */

struct buffer_head *

ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)

ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group)

{

	struct ext4_group_desc *desc;

	struct buffer_head *bh = NULL;

	struct buffer_head *bh;

	ext4_fsblk_t bitmap_blk;



	desc = ext4_get_group_desc(sb, block_group, NULL);
@@ -348,7 +348,7 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group) 
	bitmap_blk = ext4_block_bitmap(sb, desc);

	bh = sb_getblk(sb, bitmap_blk);

	if (unlikely(!bh)) {

		ext4_error(sb, "Cannot read block bitmap - "

		ext4_error(sb, "Cannot get buffer for block bitmap - "

			   "block_group = %u, block_bitmap = %llu",

			   block_group, bitmap_blk);

		return NULL;
@@ -382,25 +382,50 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group) 
		return bh;

	}

	/*

	 * submit the buffer_head for read. We can

	 * safely mark the bitmap as uptodate now.

	 * We do it here so the bitmap uptodate bit

	 * get set with buffer lock held.

	 * submit the buffer_head for reading

	 */

	set_buffer_new(bh);

	trace_ext4_read_block_bitmap_load(sb, block_group);

	set_bitmap_uptodate(bh);

	if (bh_submit_read(bh) < 0) {

		put_bh(bh);

	bh->b_end_io = ext4_end_bitmap_read;

	get_bh(bh);

	submit_bh(READ, bh);

	return bh;

}



/* Returns 0 on success, 1 on error */

int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group,

			   struct buffer_head *bh)

{

	struct ext4_group_desc *desc;



	if (!buffer_new(bh))

		return 0;

	desc = ext4_get_group_desc(sb, block_group, NULL);

	if (!desc)

		return 1;

	wait_on_buffer(bh);

	if (!buffer_uptodate(bh)) {

		ext4_error(sb, "Cannot read block bitmap - "

			   "block_group = %u, block_bitmap = %llu",

			    block_group, bitmap_blk);

		return NULL;

			   block_group, (unsigned long long) bh->b_blocknr);

		return 1;

	}

	clear_buffer_new(bh);

	/* Panic or remount fs read-only if block bitmap is invalid */

	ext4_valid_block_bitmap(sb, desc, block_group, bh);

	/*

	 * file system mounted not to panic on error,

	 * continue with corrupt bitmap

	 */

	return 0;

}



struct buffer_head *

ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)

{

	struct buffer_head *bh;



	bh = ext4_read_block_bitmap_nowait(sb, block_group);

	if (ext4_wait_block_bitmap(sb, block_group, bh)) {

		put_bh(bh);

		return NULL;

	}

	return bh;

}

fs/ext4/dir.c

+7 −6
Original line number Diff line number Diff line
@@ -91,14 +91,14 @@ int __ext4_check_dir_entry(const char *function, unsigned int line, 
		return 0;



	if (filp)

		ext4_error_file(filp, function, line, bh ? bh->b_blocknr : 0,

		ext4_error_file(filp, function, line, bh->b_blocknr,

				"bad entry in directory: %s - offset=%u(%u), "

				"inode=%u, rec_len=%d, name_len=%d",

				error_msg, (unsigned) (offset % bh->b_size),

				offset, le32_to_cpu(de->inode),

				rlen, de->name_len);

	else

		ext4_error_inode(dir, function, line, bh ? bh->b_blocknr : 0,

		ext4_error_inode(dir, function, line, bh->b_blocknr,

				"bad entry in directory: %s - offset=%u(%u), "

				"inode=%u, rec_len=%d, name_len=%d",

				error_msg, (unsigned) (offset % bh->b_size),
@@ -425,8 +425,9 @@ static int call_filldir(struct file *filp, void *dirent, 
	sb = inode->i_sb;



	if (!fname) {

		printk(KERN_ERR "EXT4-fs: call_filldir: called with "

		       "null fname?!?\n");

		ext4_msg(sb, KERN_ERR, "%s:%d: inode #%lu: comm %s: "

			 "called with null fname?!?", __func__, __LINE__,

			 inode->i_ino, current->comm);

		return 0;

	}

	curr_pos = hash2pos(fname->hash, fname->minor_hash);

fs/ext4/ext4.h

+26 −8
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
		printk(KERN_DEBUG f, ## a);				\

	} while (0)

#else

#define ext4_debug(f, a...)	do {} while (0)

#define ext4_debug(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



#define EXT4_ERROR_INODE(inode, fmt, a...) \
@@ -184,6 +184,8 @@ struct mpage_da_data { 
#define	EXT4_IO_END_UNWRITTEN	0x0001

#define EXT4_IO_END_ERROR	0x0002

#define EXT4_IO_END_QUEUED	0x0004

#define EXT4_IO_END_DIRECT	0x0008

#define EXT4_IO_END_IN_FSYNC	0x0010



struct ext4_io_page {

	struct page	*p_page;
@@ -192,18 +194,25 @@ struct ext4_io_page { 


#define MAX_IO_PAGES 128



/*

 * For converting uninitialized extents on a work queue.

 *

 * 'page' is only used from the writepage() path; 'pages' is only used for

 * buffered writes; they are used to keep page references until conversion

 * takes place.  For AIO/DIO, neither field is filled in.

 */

typedef struct ext4_io_end {

	struct list_head	list;		/* per-file finished IO list */

	struct inode		*inode;		/* file being written to */

	unsigned int		flag;		/* unwritten or not */

	struct page		*page;		/* page struct for buffer write */

	struct page		*page;		/* for writepage() path */

	loff_t			offset;		/* offset in the file */

	ssize_t			size;		/* size of the extent */

	struct work_struct	work;		/* data work queue */

	struct kiocb		*iocb;		/* iocb struct for AIO */

	int			result;		/* error value for AIO */

	int			num_io_pages;

	struct ext4_io_page	*pages[MAX_IO_PAGES];

	int			num_io_pages;   /* for writepages() */

	struct ext4_io_page	*pages[MAX_IO_PAGES]; /* for writepages() */

} ext4_io_end_t;



struct ext4_io_submit {
@@ -923,6 +932,7 @@ struct ext4_inode_info { 
#define EXT4_MOUNT_ERRORS_CONT		0x00010	/* Continue on errors */

#define EXT4_MOUNT_ERRORS_RO		0x00020	/* Remount fs ro on errors */

#define EXT4_MOUNT_ERRORS_PANIC		0x00040	/* Panic on errors */

#define EXT4_MOUNT_ERRORS_MASK		0x00070

#define EXT4_MOUNT_MINIX_DF		0x00080	/* Mimics the Minix statfs */

#define EXT4_MOUNT_NOLOAD		0x00100	/* Don't use existing journal*/

#define EXT4_MOUNT_DATA_FLAGS		0x00C00	/* Mode for data writes: */
@@ -941,7 +951,6 @@ struct ext4_inode_info { 
#define EXT4_MOUNT_DIOREAD_NOLOCK	0x400000 /* Enable support for dio read nolocking */

#define EXT4_MOUNT_JOURNAL_CHECKSUM	0x800000 /* Journal checksums */

#define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT	0x1000000 /* Journal Async Commit */

#define EXT4_MOUNT_I_VERSION            0x2000000 /* i_version support */

#define EXT4_MOUNT_MBLK_IO_SUBMIT	0x4000000 /* multi-block io submits */

#define EXT4_MOUNT_DELALLOC		0x8000000 /* Delalloc support */

#define EXT4_MOUNT_DATA_ERR_ABORT	0x10000000 /* Abort on file data write */
@@ -1142,6 +1151,7 @@ struct ext4_sb_info { 
	unsigned int s_mount_opt;

	unsigned int s_mount_opt2;

	unsigned int s_mount_flags;

	unsigned int s_def_mount_opt;

	ext4_fsblk_t s_sb_block;

	uid_t s_resuid;

	gid_t s_resgid;
@@ -1420,8 +1430,9 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) 
#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200

#define EXT4_FEATURE_INCOMPAT_EA_INODE		0x0400 /* EA in inode */

#define EXT4_FEATURE_INCOMPAT_DIRDATA		0x1000 /* data in dirent */

#define EXT4_FEATURE_INCOMPAT_INLINEDATA	0x2000 /* data in inode */

#define EXT4_FEATURE_INCOMPAT_BG_USE_META_CSUM	0x2000 /* use crc32c for bg */

#define EXT4_FEATURE_INCOMPAT_LARGEDIR		0x4000 /* >2GB or 3-lvl htree */

#define EXT4_FEATURE_INCOMPAT_INLINEDATA	0x8000 /* data in inode */



#define EXT2_FEATURE_COMPAT_SUPP	EXT4_FEATURE_COMPAT_EXT_ATTR

#define EXT2_FEATURE_INCOMPAT_SUPP	(EXT4_FEATURE_INCOMPAT_FILETYPE| \
@@ -1794,7 +1805,13 @@ extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb, 
						    ext4_group_t block_group,

						    struct buffer_head ** bh);

extern int ext4_should_retry_alloc(struct super_block *sb, int *retries);

struct buffer_head *ext4_read_block_bitmap(struct super_block *sb,



extern struct buffer_head *ext4_read_block_bitmap_nowait(struct super_block *sb,

						ext4_group_t block_group);

extern int ext4_wait_block_bitmap(struct super_block *sb,

				  ext4_group_t block_group,

				  struct buffer_head *bh);

extern struct buffer_head *ext4_read_block_bitmap(struct super_block *sb,

						  ext4_group_t block_group);

extern void ext4_init_block_bitmap(struct super_block *sb,

				   struct buffer_head *bh,
@@ -1841,6 +1858,7 @@ extern void ext4_check_inodes_bitmap(struct super_block *); 
extern void ext4_mark_bitmap_end(int start_bit, int end_bit, char *bitmap);

extern int ext4_init_inode_table(struct super_block *sb,

				 ext4_group_t group, int barrier);

extern void ext4_end_bitmap_read(struct buffer_head *bh, int uptodate);



/* mballoc.c */

extern long ext4_mb_stats;

fs/ext4/ext4_extents.h

+2 −2
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ 
 */

#define EXT_DEBUG__

#ifdef EXT_DEBUG

#define ext_debug(a...)		printk(a)

#define ext_debug(fmt, ...)	printk(fmt, ##__VA_ARGS__)

#else

#define ext_debug(a...)

#define ext_debug(fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



/*