Commit 95eaefbd authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: fix the number of credits needed for acl ops with inline data 



Operations which modify extended attributes may need extra journal
credits if inline data is used, since there is a chance that some
extended attributes may need to get pushed to an external attribute
block.

Changes to reflect this was made in xattr.c, but they were missed in
fs/ext4/acl.c.  To fix this, abstract the calculation of the number of
credits needed for xattr operations to an inline function defined in
ext4_jbd2.h, and use it in acl.c and xattr.c.

Also move the function declarations used in inline.c from xattr.h
(where they are non-obviously hidden, and caused problems since
ext4_jbd2.h needs to use the function ext4_has_inline_data), and move
them to ext4.h.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: default avatarTao Ma <boyu.mt@taobao.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 64044abf

fs/ext4/acl.c

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ ext4_acl_chmod(struct inode *inode) 
		return error;

retry:

	handle = ext4_journal_start(inode, EXT4_HT_XATTR,

			EXT4_DATA_TRANS_BLOCKS(inode->i_sb));

				    ext4_jbd2_credits_xattr(inode));

	if (IS_ERR(handle)) {

		error = PTR_ERR(handle);

		ext4_std_error(inode->i_sb, error);
@@ -423,7 +423,7 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value, 


retry:

	handle = ext4_journal_start(inode, EXT4_HT_XATTR,

				    EXT4_DATA_TRANS_BLOCKS(inode->i_sb));

				    ext4_jbd2_credits_xattr(inode));

	if (IS_ERR(handle)) {

		error = PTR_ERR(handle);

		goto release_and_out;

fs/ext4/ext4.h

+69 −0
Original line number Diff line number Diff line
@@ -2456,6 +2456,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;

fs/ext4/ext4_jbd2.h

+14 −0
Original line number Diff line number Diff line
@@ -104,6 +104,20 @@ 
#define EXT4_MAXQUOTAS_INIT_BLOCKS(sb) (MAXQUOTAS*EXT4_QUOTA_INIT_BLOCKS(sb))

#define EXT4_MAXQUOTAS_DEL_BLOCKS(sb) (MAXQUOTAS*EXT4_QUOTA_DEL_BLOCKS(sb))



static inline int ext4_jbd2_credits_xattr(struct inode *inode)

{

	int credits = EXT4_DATA_TRANS_BLOCKS(inode->i_sb);



	/*

	 * In case of inline data, we may push out the data to a block,

	 * so we need to reserve credits for this eventuality

	 */

	if (ext4_has_inline_data(inode))

		credits += ext4_writepage_trans_blocks(inode) + 1;

	return credits;

}





/*

 * Ext4 handle operation types -- for logging purposes

 */

fs/ext4/xattr.c

+1 −8
Original line number Diff line number Diff line
@@ -1165,16 +1165,9 @@ ext4_xattr_set(struct inode *inode, int name_index, const char *name, 
{

	handle_t *handle;

	int error, retries = 0;

	int credits = EXT4_DATA_TRANS_BLOCKS(inode->i_sb);

	int credits = ext4_jbd2_credits_xattr(inode);



retry:

	/*

	 * In case of inline data, we may push out the data to a block,

	 * So reserve the journal space first.

	 */

	if (ext4_has_inline_data(inode))

		credits += ext4_writepage_trans_blocks(inode) + 1;



	handle = ext4_journal_start(inode, EXT4_HT_XATTR, credits);

	if (IS_ERR(handle)) {

		error = PTR_ERR(handle);

fs/ext4/xattr.h

+0 −68
Original line number Diff line number Diff line
@@ -125,74 +125,6 @@ extern int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode, 
				       struct ext4_xattr_info *i,

				       struct ext4_xattr_ibody_find *is);



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);



#ifdef CONFIG_EXT4_FS_SECURITY

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

			      struct inode *dir, const struct qstr *qstr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE