Commit 0732f877 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  jbd2: clean up jbd2_journal_try_to_free_buffers()
  ext4: Don't update ctime for non-extent-mapped inodes
  ext4: Fix up whitespace issues in fs/ext4/inode.c
  ext4: Fix 64-bit block type problem on 32-bit platforms
  ext4: teach the inode allocator to use a goal inode number
  ext4: Use a hash of the topdir directory name for the Orlov parent group
  ext4: document the "abort" mount option
  ext4: move the abort flag from s_mount_opts to s_mount_flags
  ext4: update the s_last_mounted field in the superblock
  ext4: change s_mount_opt to be an unsigned int
  ext4: online defrag -- Add EXT4_IOC_MOVE_EXT ioctl
  ext4: avoid unnecessary spinlock in critical POSIX ACL path
  ext3: avoid unnecessary spinlock in critical POSIX ACL path
  ext4: convert instrumentation from markers to tracepoints
  jbd2: convert instrumentation from markers to tracepoints
parents 15fc204a 536fc240

Documentation/ABI/testing/sysfs-fs-ext4

+10 −0
Original line number Original line Diff line number Diff line
@@ -79,3 +79,13 @@ Description: 
		This file is read-only and shows the number of

		This file is read-only and shows the number of

		kilobytes of data that have been written to this

		kilobytes of data that have been written to this

		filesystem since it was mounted.

		filesystem since it was mounted.



What:		/sys/fs/ext4/<disk>/inode_goal

Date:		June 2008

Contact:	"Theodore Ts'o" <tytso@mit.edu>

Description:

		Tuning parameter which (if non-zero) controls the goal

		inode used by the inode allocator in p0reference to

		all other allocation hueristics.  This is intended for

		debugging use only, and should be 0 on production

		systems.

Documentation/filesystems/ext4.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -235,6 +235,10 @@ minixdf Make 'df' act like Minix. 




debug			Extra debugging information is sent to syslog.

debug			Extra debugging information is sent to syslog.





abort			Simulate the effects of calling ext4_abort() for

			debugging purposes.  This is normally used while

			remounting a filesystem which is already mounted.



errors=remount-ro	Remount the filesystem read-only on an error.

errors=remount-ro	Remount the filesystem read-only on an error.

errors=continue		Keep going on a filesystem error.

errors=continue		Keep going on a filesystem error.

errors=panic		Panic and halt the machine if an error occurs.

errors=panic		Panic and halt the machine if an error occurs.

fs/ext4/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ obj-$(CONFIG_EXT4_FS) += ext4.o 




ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \

ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \

		ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \

		ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \

		ext4_jbd2.o migrate.o mballoc.o block_validity.o

		ext4_jbd2.o migrate.o mballoc.o block_validity.o move_extent.o





ext4-$(CONFIG_EXT4_FS_XATTR)		+= xattr.o xattr_user.o xattr_trusted.o

ext4-$(CONFIG_EXT4_FS_XATTR)		+= xattr.o xattr_user.o xattr_trusted.o

ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o

ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o

fs/ext4/ext4.h

+28 −11
Original line number Original line Diff line number Diff line
@@ -352,6 +352,7 @@ struct ext4_new_group_data { 
 /* note ioctl 10 reserved for an early version of the FIEMAP ioctl */

 /* note ioctl 10 reserved for an early version of the FIEMAP ioctl */

 /* note ioctl 11 reserved for filesystem-independent FIEMAP ioctl */

 /* note ioctl 11 reserved for filesystem-independent FIEMAP ioctl */

#define EXT4_IOC_ALLOC_DA_BLKS		_IO('f', 12)

#define EXT4_IOC_ALLOC_DA_BLKS		_IO('f', 12)

#define EXT4_IOC_MOVE_EXT		_IOWR('f', 15, struct move_extent)





/*

/*

 * ioctl commands in 32 bit emulation

 * ioctl commands in 32 bit emulation
@@ -447,6 +448,15 @@ struct ext4_inode { 
	__le32  i_version_hi;	/* high 32 bits for 64-bit version */

	__le32  i_version_hi;	/* high 32 bits for 64-bit version */

};

};





struct move_extent {

	__u32 reserved;		/* should be zero */

	__u32 donor_fd;		/* donor file descriptor */

	__u64 orig_start;	/* logical start offset in block for orig */

	__u64 donor_start;	/* logical start offset in block for donor */

	__u64 len;		/* block length to be moved */

	__u64 moved_len;	/* moved block length */

};

#define MAX_DEFRAG_SIZE         ((1UL<<31) - 1)





#define EXT4_EPOCH_BITS 2

#define EXT4_EPOCH_BITS 2

#define EXT4_EPOCH_MASK ((1 << EXT4_EPOCH_BITS) - 1)

#define EXT4_EPOCH_MASK ((1 << EXT4_EPOCH_BITS) - 1)
@@ -674,7 +684,6 @@ struct ext4_inode_info { 
#define EXT4_MOUNT_ERRORS_PANIC		0x00040	/* Panic on errors */

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

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

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

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

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

#define EXT4_MOUNT_ABORT		0x00200	/* Fatal error detected */

#define EXT4_MOUNT_DATA_FLAGS		0x00C00	/* Mode for data writes: */

#define EXT4_MOUNT_DATA_FLAGS		0x00C00	/* Mode for data writes: */

#define EXT4_MOUNT_JOURNAL_DATA		0x00400	/* Write data to journal */

#define EXT4_MOUNT_JOURNAL_DATA		0x00400	/* Write data to journal */

#define EXT4_MOUNT_ORDERED_DATA		0x00800	/* Flush data before commit */

#define EXT4_MOUNT_ORDERED_DATA		0x00800	/* Flush data before commit */
@@ -696,17 +705,10 @@ struct ext4_inode_info { 
#define EXT4_MOUNT_DATA_ERR_ABORT	0x10000000 /* Abort on file data write */

#define EXT4_MOUNT_DATA_ERR_ABORT	0x10000000 /* Abort on file data write */

#define EXT4_MOUNT_BLOCK_VALIDITY	0x20000000 /* Block validity checking */

#define EXT4_MOUNT_BLOCK_VALIDITY	0x20000000 /* Block validity checking */





/* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */

#ifndef _LINUX_EXT2_FS_H

#define clear_opt(o, opt)		o &= ~EXT4_MOUNT_##opt

#define clear_opt(o, opt)		o &= ~EXT4_MOUNT_##opt

#define set_opt(o, opt)			o |= EXT4_MOUNT_##opt

#define set_opt(o, opt)			o |= EXT4_MOUNT_##opt

#define test_opt(sb, opt)		(EXT4_SB(sb)->s_mount_opt & \

#define test_opt(sb, opt)		(EXT4_SB(sb)->s_mount_opt & \

					 EXT4_MOUNT_##opt)

					 EXT4_MOUNT_##opt)

#else

#define EXT2_MOUNT_NOLOAD		EXT4_MOUNT_NOLOAD

#define EXT2_MOUNT_ABORT		EXT4_MOUNT_ABORT

#define EXT2_MOUNT_DATA_FLAGS		EXT4_MOUNT_DATA_FLAGS

#endif





#define ext4_set_bit			ext2_set_bit

#define ext4_set_bit			ext2_set_bit

#define ext4_set_bit_atomic		ext2_set_bit_atomic

#define ext4_set_bit_atomic		ext2_set_bit_atomic
@@ -824,6 +826,13 @@ struct ext4_super_block { 
};

};





#ifdef __KERNEL__

#ifdef __KERNEL__



/*

 * run-time mount flags

 */

#define EXT4_MF_MNTDIR_SAMPLED	0x0001

#define EXT4_MF_FS_ABORTED	0x0002	/* Fatal error detected */



/*

/*

 * fourth extended-fs super-block data in memory

 * fourth extended-fs super-block data in memory

 */

 */
@@ -842,7 +851,8 @@ struct ext4_sb_info { 
	struct buffer_head * s_sbh;	/* Buffer containing the super block */

	struct buffer_head * s_sbh;	/* Buffer containing the super block */

	struct ext4_super_block *s_es;	/* Pointer to the super block in the buffer */

	struct ext4_super_block *s_es;	/* Pointer to the super block in the buffer */

	struct buffer_head **s_group_desc;

	struct buffer_head **s_group_desc;

	unsigned long  s_mount_opt;

	unsigned int s_mount_opt;

	unsigned int s_mount_flags;

	ext4_fsblk_t s_sb_block;

	ext4_fsblk_t s_sb_block;

	uid_t s_resuid;

	uid_t s_resuid;

	gid_t s_resgid;

	gid_t s_resgid;
@@ -853,6 +863,7 @@ struct ext4_sb_info { 
	int s_inode_size;

	int s_inode_size;

	int s_first_ino;

	int s_first_ino;

	unsigned int s_inode_readahead_blks;

	unsigned int s_inode_readahead_blks;

	unsigned int s_inode_goal;

	spinlock_t s_next_gen_lock;

	spinlock_t s_next_gen_lock;

	u32 s_next_generation;

	u32 s_next_generation;

	u32 s_hash_seed[4];

	u32 s_hash_seed[4];
@@ -1305,7 +1316,8 @@ extern int ext4fs_dirhash(const char *name, int len, struct 
			  dx_hash_info *hinfo);

			  dx_hash_info *hinfo);





/* ialloc.c */

/* ialloc.c */

extern struct inode * ext4_new_inode(handle_t *, struct inode *, int);

extern struct inode *ext4_new_inode(handle_t *, struct inode *, int,

				    const struct qstr *qstr, __u32 goal);

extern void ext4_free_inode(handle_t *, struct inode *);

extern void ext4_free_inode(handle_t *, struct inode *);

extern struct inode * ext4_orphan_get(struct super_block *, unsigned long);

extern struct inode * ext4_orphan_get(struct super_block *, unsigned long);

extern unsigned long ext4_count_free_inodes(struct super_block *);

extern unsigned long ext4_count_free_inodes(struct super_block *);
@@ -1329,7 +1341,7 @@ extern void ext4_discard_preallocations(struct inode *); 
extern int __init init_ext4_mballoc(void);

extern int __init init_ext4_mballoc(void);

extern void exit_ext4_mballoc(void);

extern void exit_ext4_mballoc(void);

extern void ext4_mb_free_blocks(handle_t *, struct inode *,

extern void ext4_mb_free_blocks(handle_t *, struct inode *,

		unsigned long, unsigned long, int, unsigned long *);

		ext4_fsblk_t, unsigned long, int, unsigned long *);

extern int ext4_mb_add_groupinfo(struct super_block *sb,

extern int ext4_mb_add_groupinfo(struct super_block *sb,

		ext4_group_t i, struct ext4_group_desc *desc);

		ext4_group_t i, struct ext4_group_desc *desc);

extern void ext4_mb_update_group_info(struct ext4_group_info *grp,

extern void ext4_mb_update_group_info(struct ext4_group_info *grp,
@@ -1647,6 +1659,11 @@ extern int ext4_get_blocks(handle_t *handle, struct inode *inode, 
			   struct buffer_head *bh, int flags);

			   struct buffer_head *bh, int flags);

extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

			__u64 start, __u64 len);

			__u64 start, __u64 len);

/* move_extent.c */

extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,

			     __u64 start_orig, __u64 start_donor,

			     __u64 len, __u64 *moved_len);







/*

/*

 * Add new method to test wether block and inode bitmaps are properly

 * Add new method to test wether block and inode bitmaps are properly

fs/ext4/ext4_extents.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -221,12 +221,16 @@ static inline int ext4_ext_get_actual_len(struct ext4_extent *ext) 
}

}





extern int ext4_ext_calc_metadata_amount(struct inode *inode, int blocks);

extern int ext4_ext_calc_metadata_amount(struct inode *inode, int blocks);

extern ext4_fsblk_t ext_pblock(struct ext4_extent *ex);

extern ext4_fsblk_t idx_pblock(struct ext4_extent_idx *);

extern ext4_fsblk_t idx_pblock(struct ext4_extent_idx *);

extern void ext4_ext_store_pblock(struct ext4_extent *, ext4_fsblk_t);

extern void ext4_ext_store_pblock(struct ext4_extent *, ext4_fsblk_t);

extern int ext4_extent_tree_init(handle_t *, struct inode *);

extern int ext4_extent_tree_init(handle_t *, struct inode *);

extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,

extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,

						   int num,

						   int num,

						   struct ext4_ext_path *path);

						   struct ext4_ext_path *path);

extern int ext4_can_extents_be_merged(struct inode *inode,

				      struct ext4_extent *ex1,

				      struct ext4_extent *ex2);

extern int ext4_ext_try_to_merge(struct inode *inode,

extern int ext4_ext_try_to_merge(struct inode *inode,

				 struct ext4_ext_path *path,

				 struct ext4_ext_path *path,

				 struct ext4_extent *);

				 struct ext4_extent *);