Commit 6515925b 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 from Theodore Ts'o:
 "The one new feature added in this patch series is the ability to use
  the "punch hole" functionality for inodes that are not using extent
  maps.

  In the bug fix category, we fixed some races in the AIO and fstrim
  code, and some potential NULL pointer dereferences and memory leaks in
  error handling code paths.

  In the optimization category, we fixed a performance regression in the
  jbd2 layer introduced by commit d9b01934 ("jbd: fix fsync() tid
  wraparound bug", introduced in v3.0) which shows up in the AIM7
  benchmark.  We also further optimized jbd2 by minimize the amount of
  time that transaction handles are held active.

  This patch series also features some additional enhancement of the
  extent status tree, which is now used to cache extent information in a
  more efficient/compact form than what we use on-disk."

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (65 commits)
  ext4: fix free clusters calculation in bigalloc filesystem
  ext4: no need to remove extent if len is 0 in ext4_es_remove_extent()
  ext4: fix xattr block allocation/release with bigalloc
  ext4: reclaim extents from extent status tree
  ext4: adjust some functions for reclaiming extents from extent status tree
  ext4: remove single extent cache
  ext4: lookup block mapping in extent status tree
  ext4: track all extent status in extent status tree
  ext4: let ext4_ext_map_blocks return EXT4_MAP_UNWRITTEN flag
  ext4: rename and improbe ext4_es_find_extent()
  ext4: add physical block and status member into extent status tree
  ext4: refine extent status tree
  ext4: use ERR_PTR() abstraction for ext4_append()
  ext4: refactor code to read directory blocks into ext4_read_dirblock()
  ext4: add debugging context for warning in ext4_da_update_reserve_space()
  ext4: use KERN_WARNING for warning messages
  jbd2: use module parameters instead of debugfs for jbd_debug
  ext4: use module parameters instead of debugfs for mballoc_debug
  ext4: start handle at the last possible moment when creating inodes
  ext4: fix the number of credits needed for acl ops with inline data
  ...
parents bbbd27e6 304e220f

fs/ext4/acl.c

+4 −3
Original line number Diff line number Diff line
@@ -324,8 +324,8 @@ ext4_acl_chmod(struct inode *inode) 
	if (error)

		return error;

retry:

	handle = ext4_journal_start(inode,

			EXT4_DATA_TRANS_BLOCKS(inode->i_sb));

	handle = ext4_journal_start(inode, EXT4_HT_XATTR,

				    ext4_jbd2_credits_xattr(inode));

	if (IS_ERR(handle)) {

		error = PTR_ERR(handle);

		ext4_std_error(inode->i_sb, error);
@@ -422,7 +422,8 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value, 
		acl = NULL;



retry:

	handle = ext4_journal_start(inode, EXT4_DATA_TRANS_BLOCKS(inode->i_sb));

	handle = ext4_journal_start(inode, EXT4_HT_XATTR,

				    ext4_jbd2_credits_xattr(inode));

	if (IS_ERR(handle)) {

		error = PTR_ERR(handle);

		goto release_and_out;

fs/ext4/balloc.c

+10 −3
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ void ext4_validate_block_bitmap(struct super_block *sb, 
}



/**

 * ext4_read_block_bitmap()

 * ext4_read_block_bitmap_nowait()

 * @sb:			super block

 * @block_group:	given block group

 *
@@ -457,6 +457,8 @@ 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 (!bh)

		return NULL;

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

		put_bh(bh);

		return NULL;
@@ -482,11 +484,16 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi, 


	free_clusters  = percpu_counter_read_positive(fcc);

	dirty_clusters = percpu_counter_read_positive(dcc);

	root_clusters = EXT4_B2C(sbi, ext4_r_blocks_count(sbi->s_es));



	/*

	 * r_blocks_count should always be multiple of the cluster ratio so

	 * we are safe to do a plane bit shift only.

	 */

	root_clusters = ext4_r_blocks_count(sbi->s_es) >> sbi->s_cluster_bits;



	if (free_clusters - (nclusters + root_clusters + dirty_clusters) <

					EXT4_FREECLUSTERS_WATERMARK) {

		free_clusters  = EXT4_C2B(sbi, percpu_counter_sum_positive(fcc));

		free_clusters  = percpu_counter_sum_positive(fcc);

		dirty_clusters = percpu_counter_sum_positive(dcc);

	}

	/* Check whether we have space after accounting for current

fs/ext4/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ static int ext4_readdir(struct file *filp, 
					"at offset %llu",

					(unsigned long long)filp->f_pos);

			filp->f_pos += sb->s_blocksize - offset;

			brelse(bh);

			continue;

		}

		set_buffer_verified(bh);

fs/ext4/ext4.h

+103 −20
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ 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_DIRECT	0x0004



struct ext4_io_page {

	struct page	*p_page;
@@ -215,10 +214,8 @@ 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;		/* 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;   /* for writepages() */
@@ -582,6 +579,8 @@ enum { 
#define EXT4_GET_BLOCKS_KEEP_SIZE		0x0080

	/* Do not take i_data_sem locking in ext4_map_blocks */

#define EXT4_GET_BLOCKS_NO_LOCK			0x0100

	/* Do not put hole in extent cache */

#define EXT4_GET_BLOCKS_NO_PUT_HOLE		0x0200



/*

 * Flags used by ext4_free_blocks
@@ -810,17 +809,6 @@ do { \ 


#endif /* defined(__KERNEL__) || defined(__linux__) */



/*

 * storage for cached extent

 * If ec_len == 0, then the cache is invalid.

 * If ec_start == 0, then the cache represents a gap (null mapping)

 */

struct ext4_ext_cache {

	ext4_fsblk_t	ec_start;

	ext4_lblk_t	ec_block;

	__u32		ec_len; /* must be 32bit to return holes */

};



#include "extents_status.h"



/*
@@ -887,7 +875,6 @@ struct ext4_inode_info { 
	struct inode vfs_inode;

	struct jbd2_inode *jinode;



	struct ext4_ext_cache i_cached_extent;

	/*

	 * File creation time. Its function is same as that of

	 * struct timespec i_{a,c,m}time in the generic inode.
@@ -901,6 +888,8 @@ struct ext4_inode_info { 
	/* extents status tree */

	struct ext4_es_tree i_es_tree;

	rwlock_t i_es_lock;

	struct list_head i_es_lru;

	unsigned int i_es_lru_nr;	/* protected by i_es_lock */



	/* ialloc */

	ext4_group_t	i_last_alloc_group;
@@ -930,6 +919,7 @@ struct ext4_inode_info { 
	spinlock_t i_completed_io_lock;

	atomic_t i_ioend_count;	/* Number of outstanding io_end structs */

	atomic_t i_unwritten; /* Nr. of inflight conversions pending */

	struct work_struct i_unwritten_work;	/* deferred extent conversion */



	spinlock_t i_block_reservation_lock;
@@ -985,7 +975,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_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 */

#define EXT4_MOUNT_BLOCK_VALIDITY	0x20000000 /* Block validity checking */
@@ -1316,6 +1305,11 @@ struct ext4_sb_info { 


	/* Precomputed FS UUID checksum for seeding other checksums */

	__u32 s_csum_seed;



	/* Reclaim extents from extent status tree */

	struct shrinker s_es_shrinker;

	struct list_head s_es_lru;

	spinlock_t s_es_lru_lock ____cacheline_aligned_in_smp;

};



static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
@@ -2007,9 +2001,20 @@ extern int ext4fs_dirhash(const char *name, int len, struct 
			  dx_hash_info *hinfo);



/* ialloc.c */

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

extern struct inode *__ext4_new_inode(handle_t *, struct inode *, umode_t,

				      const struct qstr *qstr, __u32 goal,

				    uid_t *owner);

				      uid_t *owner, int handle_type,

				      unsigned int line_no, int nblocks);



#define ext4_new_inode(handle, dir, mode, qstr, goal, owner) \

	__ext4_new_inode((handle), (dir), (mode), (qstr), (goal), (owner), \

			 0, 0, 0)

#define ext4_new_inode_start_handle(dir, mode, qstr, goal, owner, \

				    type, nblocks)		    \

	__ext4_new_inode(NULL, (dir), (mode), (qstr), (goal), (owner), \

			 (type), __LINE__, (nblocks))





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

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

extern unsigned long ext4_count_free_inodes(struct super_block *);
@@ -2103,6 +2108,7 @@ extern ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb, 
extern int ext4_ind_calc_metadata_amount(struct inode *inode, sector_t lblock);

extern int ext4_ind_trans_blocks(struct inode *inode, int nrblocks, int chunk);

extern void ext4_ind_truncate(struct inode *inode);

extern int ext4_ind_punch_hole(struct file *file, loff_t offset, loff_t length);



/* ioctl.c */

extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
@@ -2151,6 +2157,8 @@ extern void *ext4_kvzalloc(size_t size, gfp_t flags); 
extern void ext4_kvfree(void *ptr);

extern int ext4_alloc_flex_bg_array(struct super_block *sb,

				    ext4_group_t ngroup);

extern const char *ext4_decode_error(struct super_block *sb, int errno,

				     char nbuf[16]);

extern __printf(4, 5)

void __ext4_error(struct super_block *, const char *, unsigned int,

		  const char *, ...);
@@ -2227,6 +2235,8 @@ extern int ext4_group_desc_csum_verify(struct super_block *sb, __u32 group, 
				       struct ext4_group_desc *gdp);

extern void ext4_group_desc_csum_set(struct super_block *sb, __u32 group,

				     struct ext4_group_desc *gdp);

extern int ext4_register_li_request(struct super_block *sb,

				    ext4_group_t first_not_zeroed);



static inline int ext4_has_group_desc_csum(struct super_block *sb)

{
@@ -2454,6 +2464,75 @@ extern const struct file_operations ext4_file_operations; 
extern loff_t ext4_llseek(struct file *file, loff_t offset, int origin);

extern void ext4_unwritten_wait(struct inode *inode);



/* inline.c */

extern int ext4_has_inline_data(struct inode *inode);

extern int ext4_get_inline_size(struct inode *inode);

extern int ext4_get_max_inline_size(struct inode *inode);

extern int ext4_find_inline_data_nolock(struct inode *inode);

extern void ext4_write_inline_data(struct inode *inode,

				   struct ext4_iloc *iloc,

				   void *buffer, loff_t pos,

				   unsigned int len);

extern int ext4_prepare_inline_data(handle_t *handle, struct inode *inode,

				    unsigned int len);

extern int ext4_init_inline_data(handle_t *handle, struct inode *inode,

				 unsigned int len);

extern int ext4_destroy_inline_data(handle_t *handle, struct inode *inode);



extern int ext4_readpage_inline(struct inode *inode, struct page *page);

extern int ext4_try_to_write_inline_data(struct address_space *mapping,

					 struct inode *inode,

					 loff_t pos, unsigned len,

					 unsigned flags,

					 struct page **pagep);

extern int ext4_write_inline_data_end(struct inode *inode,

				      loff_t pos, unsigned len,

				      unsigned copied,

				      struct page *page);

extern struct buffer_head *

ext4_journalled_write_inline_data(struct inode *inode,

				  unsigned len,

				  struct page *page);

extern int ext4_da_write_inline_data_begin(struct address_space *mapping,

					   struct inode *inode,

					   loff_t pos, unsigned len,

					   unsigned flags,

					   struct page **pagep,

					   void **fsdata);

extern int ext4_da_write_inline_data_end(struct inode *inode, loff_t pos,

					 unsigned len, unsigned copied,

					 struct page *page);

extern int ext4_try_add_inline_entry(handle_t *handle, struct dentry *dentry,

				     struct inode *inode);

extern int ext4_try_create_inline_dir(handle_t *handle,

				      struct inode *parent,

				      struct inode *inode);

extern int ext4_read_inline_dir(struct file *filp,

				void *dirent, filldir_t filldir,

				int *has_inline_data);

extern struct buffer_head *ext4_find_inline_entry(struct inode *dir,

					const struct qstr *d_name,

					struct ext4_dir_entry_2 **res_dir,

					int *has_inline_data);

extern int ext4_delete_inline_entry(handle_t *handle,

				    struct inode *dir,

				    struct ext4_dir_entry_2 *de_del,

				    struct buffer_head *bh,

				    int *has_inline_data);

extern int empty_inline_dir(struct inode *dir, int *has_inline_data);

extern struct buffer_head *ext4_get_first_inline_block(struct inode *inode,

					struct ext4_dir_entry_2 **parent_de,

					int *retval);

extern int ext4_inline_data_fiemap(struct inode *inode,

				   struct fiemap_extent_info *fieinfo,

				   int *has_inline);

extern int ext4_try_to_evict_inline_data(handle_t *handle,

					 struct inode *inode,

					 int needed);

extern void ext4_inline_data_truncate(struct inode *inode, int *has_inline);



extern int ext4_convert_inline_data(struct inode *inode);



/* namei.c */

extern const struct inode_operations ext4_dir_inode_operations;

extern const struct inode_operations ext4_special_inode_operations;
@@ -2520,6 +2599,9 @@ extern struct ext4_ext_path *ext4_ext_find_extent(struct inode *, ext4_lblk_t, 
						  struct ext4_ext_path *);

extern void ext4_ext_drop_refs(struct ext4_ext_path *);

extern int ext4_ext_check_inode(struct inode *inode);

extern int ext4_find_delalloc_range(struct inode *inode,

				    ext4_lblk_t lblk_start,

				    ext4_lblk_t lblk_end);

extern int ext4_find_delalloc_cluster(struct inode *inode, ext4_lblk_t lblk);

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

			__u64 start, __u64 len);
@@ -2537,6 +2619,7 @@ extern void ext4_exit_pageio(void); 
extern void ext4_ioend_wait(struct inode *);

extern void ext4_free_io_end(ext4_io_end_t *io);

extern ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags);

extern void ext4_end_io_work(struct work_struct *work);

extern void ext4_io_submit(struct ext4_io_submit *io);

extern int ext4_bio_write_page(struct ext4_io_submit *io,

			       struct page *page,

fs/ext4/ext4_extents.h

+0 −6
Original line number Diff line number Diff line
@@ -193,12 +193,6 @@ static inline unsigned short ext_depth(struct inode *inode) 
	return le16_to_cpu(ext_inode_hdr(inode)->eh_depth);

}



static inline void

ext4_ext_invalidate_cache(struct inode *inode)

{

	EXT4_I(inode)->i_cached_extent.ec_len = 0;

}



static inline void ext4_ext_mark_uninitialized(struct ext4_extent *ext)

{

	/* We can not have an uninitialized extent of zero length! */

CRA Git | Maintained and supported by SUSTech CRA and CCSE