Merge branch 'master' of /usr/src/ntfs-2.6/

diff --combined fs/ntfs/file.c
index c73c8864cbad0748b02a490a7b70a0abd1c92324,fb413d3d861875932742b3ccea65d40ac99ef47b..3a119a87686ab62425ce255d90fc3d23a97281fd
--- 1/fs/ntfs/file.c
--- 2/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@@ -106,7 -106,7 +106,7 @@@ static int ntfs_file_open(struct inode 
   * 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,
@@@ -248,7 -248,7 +248,7 @@@ do_non_resident_extend
                 * enough to make ntfs_writepage() work.
                 */
                write_lock_irqsave(&ni->size_lock, flags);
 -              ni->initialized_size = (index + 1) << PAGE_CACHE_SHIFT;
 +              ni->initialized_size = (s64)(index + 1) << PAGE_CACHE_SHIFT;
                if (ni->initialized_size > new_init_size)
                        ni->initialized_size = new_init_size;
                write_unlock_irqrestore(&ni->size_lock, flags);
@@@ -473,7 -473,7 +473,7 @@@ static inline int ntfs_submit_bh_for_re
   * @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 +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 +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,
@@@ -2173,7 -2173,7 +2173,7 @@@ static ssize_t ntfs_file_aio_write_nolo
        err = remove_suid(file->f_dentry);
        if (err)
                goto out;
-       inode_update_time(inode, 1);
+       file_update_time(file);
        written = ntfs_file_buffered_write(iocb, iov, nr_segs, pos, ppos,
                        count);
  out:
@@@ -2196,9 -2196,9 +2196,9 @@@ static ssize_t ntfs_file_aio_write(stru
  
        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 +2221,12 @@@ static ssize_t ntfs_file_writev(struct 
        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 +2269,7 @@@ static ssize_t ntfs_file_write(struct f
   * 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