|
From: Hongnan Li <hon...@li...> - 2022-02-11 03:46:58
|
From: hongnanli <hon...@li...>
inode->i_mutex has been replaced with inode->i_rwsem long ago. Fix
comments still mentioning i_mutex.
Signed-off-by: hongnanli <hon...@li...>
---
fs/ntfs/attrib.c | 4 ++--
fs/ntfs/dir.c | 8 ++++----
fs/ntfs/file.c | 10 +++++-----
fs/ntfs/index.c | 6 +++---
fs/ntfs/inode.c | 4 ++--
fs/ntfs/namei.c | 4 ++--
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 2911c04a33e0..fc2cb551265b 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -1516,7 +1516,7 @@ int ntfs_resident_attr_value_resize(MFT_RECORD *m, ATTR_RECORD *a,
* NOTE to self: No changes in the attribute list are required to move from
* a resident to a non-resident attribute.
*
- * Locking: - The caller must hold i_mutex on the inode.
+ * Locking: - The caller must hold i_rwsem on the inode.
*/
int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)
{
@@ -1721,7 +1721,7 @@ int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)
/*
* This needs to be last since the address space operations ->readpage
* and ->writepage can run concurrently with us as they are not
- * serialized on i_mutex. Note, we are not allowed to fail once we flip
+ * serialized on i_rwsem. Note, we are not allowed to fail once we flip
* this switch, which is another reason to do this last.
*/
NInoSetNonResident(ni);
diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
index cd96083a12c8..26ac22528bd8 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -56,7 +56,7 @@ ntfschar I30[5] = { cpu_to_le16('$'), cpu_to_le16('I'),
* work but we don't care for how quickly one can access them. This also fixes
* the dcache aliasing issues.
*
- * Locking: - Caller must hold i_mutex on the directory.
+ * Locking: - Caller must hold i_rwsem on the directory.
* - Each page cache page in the index allocation mapping must be
* locked whilst being accessed otherwise we may find a corrupt
* page due to it being under ->writepage at the moment which
@@ -1071,11 +1071,11 @@ static inline int ntfs_filldir(ntfs_volume *vol,
* While this will return the names in random order this doesn't matter for
* ->readdir but OTOH results in a faster ->readdir.
*
- * VFS calls ->readdir without BKL but with i_mutex held. This protects the VFS
+ * VFS calls ->readdir without BKL but with i_rwsem held. This protects the VFS
* parts (e.g. ->f_pos and ->i_size, and it also protects against directory
* modifications).
*
- * Locking: - Caller must hold i_mutex on the directory.
+ * Locking: - Caller must hold i_rwsem on the directory.
* - Each page cache page in the index allocation mapping must be
* locked whilst being accessed otherwise we may find a corrupt
* page due to it being under ->writepage at the moment which
@@ -1477,7 +1477,7 @@ static int ntfs_dir_open(struct inode *vi, struct file *filp)
* Note: In the past @filp could be NULL so we ignore it as we don't need it
* anyway.
*
- * Locking: Caller must hold i_mutex on the inode.
+ * Locking: Caller must hold i_rwsem on the inode.
*
* TODO: We should probably also write all attribute/index inodes associated
* with this inode but since we have no simple way of getting to them we ignore
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 2ae25e48a41a..82cba5c967fe 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -90,7 +90,7 @@ static int ntfs_file_open(struct inode *vi, struct file *filp)
* this is the case, the necessary zeroing will also have happened and that all
* metadata is self-consistent.
*
- * Locking: i_mutex on the vfs inode corrseponsind to the ntfs inode @ni must be
+ * Locking: i_rwsem on the vfs inode corrseponsind to the ntfs inode @ni must be
* held by the caller.
*/
static int ntfs_attr_extend_initialized(ntfs_inode *ni, const s64 new_init_size)
@@ -458,7 +458,7 @@ static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb,
if (pos > ll) {
/*
* Wait for ongoing direct i/o to complete before proceeding.
- * New direct i/o cannot start as we hold i_mutex.
+ * New direct i/o cannot start as we hold i_rwsem.
*/
inode_dio_wait(vi);
err = ntfs_attr_extend_initialized(ni, pos);
@@ -548,7 +548,7 @@ static inline int ntfs_submit_bh_for_read(struct buffer_head *bh)
* @bytes: number of bytes to be written
*
* This is called for non-resident attributes from ntfs_file_buffered_write()
- * with i_mutex held on the inode (@pages[0]->mapping->host). There are
+ * with i_rwsem held on the inode (@pages[0]->mapping->host). There are
* @nr_pages pages in @pages which are locked but not kmap()ped. The source
* data has not yet been copied into the @pages.
*
@@ -1505,7 +1505,7 @@ static inline int ntfs_commit_pages_after_non_resident_write(
* @pos: byte position in file at which the write begins
* @bytes: number of bytes to be written
*
- * This is called from ntfs_file_buffered_write() with i_mutex held on the inode
+ * This is called from ntfs_file_buffered_write() with i_rwsem held on the inode
* (@pages[0]->mapping->host). There are @nr_pages pages in @pages which are
* locked but not kmap()ped. The source data has already been copied into the
* @page. ntfs_prepare_pages_for_non_resident_write() has been called before
@@ -1946,7 +1946,7 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
* Also, if @datasync is true, we do not wait on the inode to be written out
* but we always wait on the page cache pages to be written out.
*
- * Locking: Caller must hold i_mutex on the inode.
+ * Locking: Caller must hold i_rwsem on the inode.
*
* TODO: We should probably also write all attribute/index inodes associated
* with this inode but since we have no simple way of getting to them we ignore
diff --git a/fs/ntfs/index.c b/fs/ntfs/index.c
index d46c2c03a032..170eec12d83e 100644
--- a/fs/ntfs/index.c
+++ b/fs/ntfs/index.c
@@ -20,7 +20,7 @@
* Allocate a new index context, initialize it with @idx_ni and return it.
* Return NULL if allocation failed.
*
- * Locking: Caller must hold i_mutex on the index inode.
+ * Locking: Caller must hold i_rwsem on the index inode.
*/
ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni)
{
@@ -38,7 +38,7 @@ ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni)
*
* Release the index context @ictx, releasing all associated resources.
*
- * Locking: Caller must hold i_mutex on the index inode.
+ * Locking: Caller must hold i_rwsem on the index inode.
*/
void ntfs_index_ctx_put(ntfs_index_context *ictx)
{
@@ -94,7 +94,7 @@ void ntfs_index_ctx_put(ntfs_index_context *ictx)
* or ntfs_index_entry_write() before the call to ntfs_index_ctx_put() to
* ensure that the changes are written to disk.
*
- * Locking: - Caller must hold i_mutex on the index inode.
+ * Locking: - Caller must hold i_rwsem on the index inode.
* - Each page cache page in the index allocation mapping must be
* locked whilst being accessed otherwise we may find a corrupt
* page due to it being under ->writepage at the moment which
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 4474adb393ca..f1f76c7f2984 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -2339,7 +2339,7 @@ static const char *es = " Leaving inconsistent metadata. Unmount and run "
*
* Returns 0 on success or -errno on error.
*
- * Called with ->i_mutex held.
+ * Called with ->i_rwsem held.
*/
int ntfs_truncate(struct inode *vi)
{
@@ -2865,7 +2865,7 @@ void ntfs_truncate_vfs(struct inode *vi) {
* We also abort all changes of user, group, and mode as we do not implement
* the NTFS ACLs yet.
*
- * Called with ->i_mutex held.
+ * Called with ->i_rwsem held.
*/
int ntfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
struct iattr *attr)
diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c
index 4e6a44bc654c..9e66805f3640 100644
--- a/fs/ntfs/namei.c
+++ b/fs/ntfs/namei.c
@@ -84,7 +84,7 @@
* name. We then convert the name to the current NLS code page, and proceed
* searching for a dentry with this name, etc, as in case 2), above.
*
- * Locking: Caller must hold i_mutex on the directory.
+ * Locking: Caller must hold i_rwsem on the directory.
*/
static struct dentry *ntfs_lookup(struct inode *dir_ino, struct dentry *dent,
unsigned int flags)
@@ -278,7 +278,7 @@ const struct inode_operations ntfs_dir_inode_ops = {
* The code is based on the ext3 ->get_parent() implementation found in
* fs/ext3/namei.c::ext3_get_parent().
*
- * Note: ntfs_get_parent() is called with @d_inode(child_dent)->i_mutex down.
+ * Note: ntfs_get_parent() is called with @d_inode(child_dent)->i_rwsem down.
*
* Return the dentry of the parent directory on success or the error code on
* error (IS_ERR() is true).
--
2.19.1.6.gb485710b
|
