Skip to contentSkip to conversation

fs/xfs: fix comments mentioning i_mutex

PATCH In review hongnanli 2 participants 2 messages Jan 21, 2022 XFS filesystem

lore
Share & tools
lore

hongnanli

author
#0 lore raw

PATCH 1/1 fs/xfs: fix comments mentioning i_mutex

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

---
 fs/xfs/xfs_acl.c   | 2 +-
 fs/xfs/xfs_iomap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
fs/xfs/xfs_acl.c +1 -1
index 5c52ee869272..b02c83f8b8c4 100644
@@ -22,7 +22,7 @@
 
 /*
  * Locking scheme:
- *  - all ACL updates are protected by inode->i_mutex, which is taken before
+ *  - all ACL updates are protected by inode->i_rwsem, which is taken before
  *    calling into this file.
  */
 
fs/xfs/xfs_iomap.c +1 -1
index e552ce541ec2..288a5cdcaa61 100644
@@ -1126,7 +1126,7 @@ xfs_buffered_write_iomap_end(
 	 * Trim delalloc blocks if they were allocated by this write and we
 	 * didn't manage to write the whole range.
 	 *
-	 * We don't need to care about racing delalloc as we hold i_mutex
+	 * We don't need to care about racing delalloc as we hold i_rwsem
 	 * across the reserve/allocate/unreserve calls. If there are delalloc
 	 * blocks in the range, they are ours.
 	 */
Signature · 1 line
2.19.1.6.gb485710b
#1 lore raw
Quoted 14 lines · hongnanli

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

---
 fs/xfs/xfs_acl.c   | 2 +-
 fs/xfs/xfs_iomap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
fs/xfs/xfs_acl.c +0 -0
index 5c52ee869272..b02c83f8b8c4 100644

fs/xfs/xfs_acl.c line 25

Quoted 5 lines
fs/xfs/xfs_acl.c +1 -1
@@ -22,7 +22,7 @@
 
 /*
  * Locking scheme:
- *  - all ACL updates are protected by inode->i_mutex, which is taken before
+ *  - all ACL updates are protected by inode->i_rwsem, which is taken before

This should use more general terminology here, such as "VFS inode lock" or "IOLOCK" (XFS-specific shorthand), since the implementation may change again in the future.

--D

Quoted 19 lines
fs/xfs/xfs_acl.c +0 -0
  *    calling into this file.
  */
 
fs/xfs/xfs_iomap.c +1 -1
index e552ce541ec2..288a5cdcaa61 100644
@@ -1126,7 +1126,7 @@ xfs_buffered_write_iomap_end(
 	 * Trim delalloc blocks if they were allocated by this write and we
 	 * didn't manage to write the whole range.
 	 *
-	 * We don't need to care about racing delalloc as we hold i_mutex
+	 * We don't need to care about racing delalloc as we hold i_rwsem
 	 * across the reserve/allocate/unreserve calls. If there are delalloc
 	 * blocks in the range, they are ours.
 	 */
Signature · 1 line
2.19.1.6.gb485710b