Commit f340b3d9 authored by hongnanli's avatar hongnanli Committed by Theodore Ts'o
Browse files

fs/ext4: fix comments mentioning i_mutex 



inode->i_mutex has been replaced with inode->i_rwsem long ago. Fix
comments still mentioning i_mutex.

Signed-off-by: default avatarhongnanli <hongnan.li@linux.alibaba.com>
Link: https://lore.kernel.org/r/20220121070611.21618-1-hongnan.li@linux.alibaba.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 8fca8a2b

fs/ext4/acl.c

+4 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ ext4_acl_to_disk(const struct posix_acl *acl, size_t *size) 
/*

 * Inode operation get_posix_acl().

 *

 * inode->i_mutex: don't care

 * inode->i_rwsem: don't care

 */

struct posix_acl *

ext4_get_acl(struct inode *inode, int type, bool rcu)
@@ -183,7 +183,7 @@ ext4_get_acl(struct inode *inode, int type, bool rcu) 
/*

 * Set the access or default ACL of an inode.

 *

 * inode->i_mutex: down unless called from ext4_new_inode

 * inode->i_rwsem: down unless called from ext4_new_inode

 */

static int

__ext4_set_acl(handle_t *handle, struct inode *inode, int type,
@@ -271,8 +271,8 @@ ext4_set_acl(struct user_namespace *mnt_userns, struct inode *inode, 
/*

 * Initialize the ACLs of a new inode. Called from ext4_new_inode.

 *

 * dir->i_mutex: down

 * inode->i_mutex: up (access to inode is still exclusive)

 * dir->i_rwsem: down

 * inode->i_rwsem: up (access to inode is still exclusive)

 */

int

ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)

fs/ext4/ext4.h

+3 −3
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ struct ext4_inode_info { 


	/*

	 * Extended attributes can be read independently of the main file

	 * data. Taking i_mutex even when reading would cause contention

	 * data. Taking i_rwsem even when reading would cause contention

	 * between readers of EAs and writers of regular file data, so

	 * instead we synchronize on xattr_sem when reading or changing

	 * EAs.
@@ -3407,7 +3407,7 @@ do { \ 
#define EXT4_FREECLUSTERS_WATERMARK 0

#endif



/* Update i_disksize. Requires i_mutex to avoid races with truncate */

/* Update i_disksize. Requires i_rwsem to avoid races with truncate */

static inline void ext4_update_i_disksize(struct inode *inode, loff_t newsize)

{

	WARN_ON_ONCE(S_ISREG(inode->i_mode) &&
@@ -3418,7 +3418,7 @@ static inline void ext4_update_i_disksize(struct inode *inode, loff_t newsize) 
	up_write(&EXT4_I(inode)->i_data_sem);

}



/* Update i_size, i_disksize. Requires i_mutex to avoid races with truncate */

/* Update i_size, i_disksize. Requires i_rwsem to avoid races with truncate */

static inline int ext4_update_inode_size(struct inode *inode, loff_t newsize)

{

	int changed = 0;

fs/ext4/ext4_jbd2.h

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static inline int ext4_free_data_revoke_credits(struct inode *inode, int blocks) 
/*

 * This function controls whether or not we should try to go down the

 * dioread_nolock code paths, which makes it safe to avoid taking

 * i_mutex for direct I/O reads.  This only works for extent-based

 * i_rwsem for direct I/O reads.  This only works for extent-based

 * files, and it doesn't work if data journaling is enabled, since the

 * dioread_nolock code uses b_private to pass information back to the

 * I/O completion handler, and this conflicts with the jbd's use of

fs/ext4/extents.c

+4 −4
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int ext4_ext_trunc_restart_fn(struct inode *inode, int *dropped) 
	 * Drop i_data_sem to avoid deadlock with ext4_map_blocks.  At this

	 * moment, get_block can be called only for blocks inside i_size since

	 * page cache has been already dropped and writes are blocked by

	 * i_mutex. So we can safely drop the i_data_sem here.

	 * i_rwsem. So we can safely drop the i_data_sem here.

	 */

	BUG_ON(EXT4_JOURNAL(inode) == NULL);

	ext4_discard_preallocations(inode, 0);
@@ -4574,7 +4574,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 


	flags = EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT;



	/* Wait all existing dio workers, newcomers will block on i_mutex */

	/* Wait all existing dio workers, newcomers will block on i_rwsem */

	inode_dio_wait(inode);



	/* Preallocate the range including the unaligned edges */
@@ -4740,7 +4740,7 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
			goto out;

	}



	/* Wait all existing dio workers, newcomers will block on i_mutex */

	/* Wait all existing dio workers, newcomers will block on i_rwsem */

	inode_dio_wait(inode);



	ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size, flags);
@@ -5573,7 +5573,7 @@ static int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) 
 * stuff such as page-cache locking consistency, bh mapping consistency or

 * extent's data copying must be performed by caller.

 * Locking:

 * 		i_mutex is held for both inodes

 *		i_rwsem is held for both inodes

 * 		i_data_sem is locked for write for both inodes

 * Assumptions:

 *		All pages from requested range are locked for both inodes

fs/ext4/indirect.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static int ext4_ind_trunc_restart_fn(handle_t *handle, struct inode *inode, 
	 * Drop i_data_sem to avoid deadlock with ext4_map_blocks.  At this

	 * moment, get_block can be called only for blocks inside i_size since

	 * page cache has been already dropped and writes are blocked by

	 * i_mutex. So we can safely drop the i_data_sem here.

	 * i_rwsem. So we can safely drop the i_data_sem here.

	 */

	BUG_ON(EXT4_JOURNAL(inode) == NULL);

	ext4_discard_preallocations(inode, 0);