8 files changed, 36 insertions, 36 deletions

diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index eda056bac256..9480a0526cd3 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -1532,7 +1532,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_sem on the inode.
+ * Locking: - The caller must hold i_mutex on the inode.
  */
 int ntfs_attr_make_non_resident(ntfs_inode *ni, const u32 data_size)
 {
@@ -1728,7 +1728,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_sem.  Note, we are not allowed to fail once we flip
+         * serialized on i_mutex.  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 795c3d1930f5..b0690d4c8906 100644
--- a/fs/ntfs/dir.c
+++ b/fs/ntfs/dir.c
@@ -69,7 +69,7 @@ ntfschar I30[5] = { const_cpu_to_le16('$'), const_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_sem on the directory.
+ * Locking:  - Caller must hold i_mutex 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
@@ -1085,11 +1085,11 @@ static inline int ntfs_filldir(ntfs_volume *vol, loff_t fpos,
  * 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_sem held. This protects the VFS
+ * VFS calls ->readdir without BKL but with i_mutex 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_sem on the directory.
+ * Locking:  - Caller must hold i_mutex 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
@@ -1520,7 +1520,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_sem on the inode.
+ * Locking: Caller must hold i_mutex 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 727533891813..30f71acdc1cb 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -106,7 +106,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_sem on the vfs inode corrseponsind to the ntfs inode @ni must be
+ * Locking: i_mutex 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,
@@ -473,7 +473,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_sem held on the inode (@pages[0]->mapping->host).  There are
+ * with i_mutex 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.
  * 
@@ -1637,7 +1637,7 @@ err_out:
  * @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_sem held on the inode
+ * This is called from ntfs_file_buffered_write() with i_mutex 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
@@ -1814,7 +1814,7 @@ err_out:
 /**
  * ntfs_file_buffered_write -
  *
- * Locking: The vfs is holding ->i_sem on the inode.
+ * Locking: The vfs is holding ->i_mutex on the inode.
  */
 static ssize_t ntfs_file_buffered_write(struct kiocb *iocb,
                 const struct iovec *iov, unsigned long nr_segs,
@@ -2196,9 +2196,9 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const char __user *buf,
 
         BUG_ON(iocb->ki_pos != pos);
 
-        down(&inode->i_sem);
+        mutex_lock(&inode->i_mutex);
         ret = ntfs_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos);
-        up(&inode->i_sem);
+        mutex_unlock(&inode->i_mutex);
         if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
                 int err = sync_page_range(inode, mapping, pos, ret);
                 if (err < 0)
@@ -2221,12 +2221,12 @@ static ssize_t ntfs_file_writev(struct file *file, const struct iovec *iov,
         struct kiocb kiocb;
         ssize_t ret;
 
-        down(&inode->i_sem);
+        mutex_lock(&inode->i_mutex);
         init_sync_kiocb(&kiocb, file);
         ret = ntfs_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
         if (ret == -EIOCBQUEUED)
                 ret = wait_on_sync_kiocb(&kiocb);
-        up(&inode->i_sem);
+        mutex_unlock(&inode->i_mutex);
         if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
                 int err = sync_page_range(inode, mapping, *ppos - ret, ret);
                 if (err < 0)
@@ -2269,7 +2269,7 @@ static ssize_t ntfs_file_write(struct file *file, const char __user *buf,
  * Note: In the past @filp could be NULL so we ignore it as we don't need it
  * anyway.
  *
- * Locking: Caller must hold i_sem on the inode.
+ * Locking: Caller must hold i_mutex 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 8f2d5727546f..9f5427c2d105 100644
--- a/fs/ntfs/index.c
+++ b/fs/ntfs/index.c
@@ -32,7 +32,7 @@
  * Allocate a new index context, initialize it with @idx_ni and return it.
  * Return NULL if allocation failed.
  *
- * Locking:  Caller must hold i_sem on the index inode.
+ * Locking:  Caller must hold i_mutex on the index inode.
  */
 ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *idx_ni)
 {
@@ -50,7 +50,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_sem on the index inode.
+ * Locking:  Caller must hold i_mutex on the index inode.
  */
 void ntfs_index_ctx_put(ntfs_index_context *ictx)
 {
@@ -106,7 +106,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_sem on the index inode.
+ * Locking:  - Caller must hold i_mutex 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 b24f4c4b2c5c..bda7a08911a5 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -2125,13 +2125,13 @@ void ntfs_put_inode(struct inode *vi)
                 ntfs_inode *ni = NTFS_I(vi);
                 if (NInoIndexAllocPresent(ni)) {
                         struct inode *bvi = NULL;
-                        down(&vi->i_sem);
+                        mutex_lock(&vi->i_mutex);
                         if (atomic_read(&vi->i_count) == 2) {
                                 bvi = ni->itype.index.bmp_ino;
                                 if (bvi)
                                         ni->itype.index.bmp_ino = NULL;
                         }
-                        up(&vi->i_sem);
+                        mutex_unlock(&vi->i_mutex);
                         if (bvi)
                                 iput(bvi);
                 }
@@ -2311,7 +2311,7 @@ static const char *es = "  Leaving inconsistent metadata.  Unmount and run "
  *
  * Returns 0 on success or -errno on error.
  *
- * Called with ->i_sem held.  In all but one case ->i_alloc_sem is held for
+ * Called with ->i_mutex held.  In all but one case ->i_alloc_sem is held for
  * writing.  The only case in the kernel where ->i_alloc_sem is not held is
  * mm/filemap.c::generic_file_buffered_write() where vmtruncate() is called
  * with the current i_size as the offset.  The analogous place in NTFS is in
@@ -2831,7 +2831,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_sem held.  For the ATTR_SIZE (i.e. ->truncate) case, also
+ * Called with ->i_mutex held.  For the ATTR_SIZE (i.e. ->truncate) case, also
  * called with ->i_alloc_sem held for writing.
  *
  * Basically this is a copy of generic notify_change() and inode_setattr()
diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c
index 351dbc3b6e40..5ea9eb93af62 100644
--- a/fs/ntfs/namei.c
+++ b/fs/ntfs/namei.c
@@ -96,7 +96,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_sem on the directory.
+ * Locking: Caller must hold i_mutex on the directory.
  */
 static struct dentry *ntfs_lookup(struct inode *dir_ino, struct dentry *dent,
                 struct nameidata *nd)
@@ -254,7 +254,7 @@ handle_name:
         nls_name.hash = full_name_hash(nls_name.name, nls_name.len);
 
         /*
-         * Note: No need for dent->d_lock lock as i_sem is held on the
+         * Note: No need for dent->d_lock lock as i_mutex is held on the
          * parent inode.
          */
 
@@ -374,7 +374,7 @@ 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 @child_dent->d_inode->i_sem down.
+ * Note: ntfs_get_parent() is called with @child_dent->d_inode->i_mutex down.
  *
  * Return the dentry of the parent directory on success or the error code on
  * error (IS_ERR() is true).
diff --git a/fs/ntfs/quota.c b/fs/ntfs/quota.c
index 833df2a4e9fb..d0ef4182147b 100644
--- a/fs/ntfs/quota.c
+++ b/fs/ntfs/quota.c
@@ -48,7 +48,7 @@ BOOL ntfs_mark_quotas_out_of_date(ntfs_volume *vol)
                 ntfs_error(vol->sb, "Quota inodes are not open.");
                 return FALSE;
         }
-        down(&vol->quota_q_ino->i_sem);
+        mutex_lock(&vol->quota_q_ino->i_mutex);
         ictx = ntfs_index_ctx_get(NTFS_I(vol->quota_q_ino));
         if (!ictx) {
                 ntfs_error(vol->sb, "Failed to get index context.");
@@ -98,7 +98,7 @@ BOOL ntfs_mark_quotas_out_of_date(ntfs_volume *vol)
         ntfs_index_entry_mark_dirty(ictx);
 set_done:
         ntfs_index_ctx_put(ictx);
-        up(&vol->quota_q_ino->i_sem);
+        mutex_unlock(&vol->quota_q_ino->i_mutex);
         /*
          * We set the flag so we do not try to mark the quotas out of date
          * again on remount.
@@ -110,7 +110,7 @@ done:
 err_out:
         if (ictx)
                 ntfs_index_ctx_put(ictx);
-        up(&vol->quota_q_ino->i_sem);
+        mutex_unlock(&vol->quota_q_ino->i_mutex);
         return FALSE;
 }
 
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 6c16db9e1a8a..280e383fc84e 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -1213,10 +1213,10 @@ static int check_windows_hibernation_status(ntfs_volume *vol)
          * Find the inode number for the hibernation file by looking up the
          * filename hiberfil.sys in the root directory.
          */
-        down(&vol->root_ino->i_sem);
+        mutex_lock(&vol->root_ino->i_mutex);
         mref = ntfs_lookup_inode_by_name(NTFS_I(vol->root_ino), hiberfil, 12,
                         &name);
-        up(&vol->root_ino->i_sem);
+        mutex_unlock(&vol->root_ino->i_mutex);
         if (IS_ERR_MREF(mref)) {
                 ret = MREF_ERR(mref);
                 /* If the file does not exist, Windows is not hibernated. */
@@ -1307,10 +1307,10 @@ static BOOL load_and_init_quota(ntfs_volume *vol)
          * Find the inode number for the quota file by looking up the filename
          * $Quota in the extended system files directory $Extend.
          */
-        down(&vol->extend_ino->i_sem);
+        mutex_lock(&vol->extend_ino->i_mutex);
         mref = ntfs_lookup_inode_by_name(NTFS_I(vol->extend_ino), Quota, 6,
                         &name);
-        up(&vol->extend_ino->i_sem);
+        mutex_unlock(&vol->extend_ino->i_mutex);
         if (IS_ERR_MREF(mref)) {
                 /*
                  * If the file does not exist, quotas are disabled and have
@@ -1390,10 +1390,10 @@ static BOOL load_and_init_usnjrnl(ntfs_volume *vol)
          * Find the inode number for the transaction log file by looking up the
          * filename $UsnJrnl in the extended system files directory $Extend.
          */
-        down(&vol->extend_ino->i_sem);
+        mutex_lock(&vol->extend_ino->i_mutex);
         mref = ntfs_lookup_inode_by_name(NTFS_I(vol->extend_ino), UsnJrnl, 8,
                         &name);
-        up(&vol->extend_ino->i_sem);
+        mutex_unlock(&vol->extend_ino->i_mutex);
         if (IS_ERR_MREF(mref)) {
                 /*
                  * If the file does not exist, transaction logging is disabled,
@@ -2312,9 +2312,9 @@ static void ntfs_put_super(struct super_block *sb)
         if (!list_empty(&sb->s_dirty)) {
                 const char *s1, *s2;
 
-                down(&vol->mft_ino->i_sem);
+                mutex_lock(&vol->mft_ino->i_mutex);
                 truncate_inode_pages(vol->mft_ino->i_mapping, 0);
-                up(&vol->mft_ino->i_sem);
+                mutex_unlock(&vol->mft_ino->i_mutex);
                 write_inode_now(vol->mft_ino, 1);
                 if (!list_empty(&sb->s_dirty)) {
                         static const char *_s1 = "inodes";