Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: set non-default s_time_gran during mount
  ocfs2: Retry sendpage() if it returns EAGAIN
  ocfs2: Fix rename/extend race
  [2.6 patch] ocfs2_insert_extent(): remove dead code
  ocfs2: Fix max offset calculations
  ocfs2: check ia_size limits in setattr
  ocfs2: Fix some casting errors related to file writes
  ocfs2: use s_maxbytes directly in ocfs2_change_file_space()
  ocfs2: Restrict inode changes in ocfs2_update_inode_atime()

1 files changed, 25 insertions, 3 deletions

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index c4034f693e7b..4ffa715be09c 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -187,6 +187,7 @@ int ocfs2_update_inode_atime(struct inode *inode,
         int ret;
         struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
         handle_t *handle;
+        struct ocfs2_dinode *di = (struct ocfs2_dinode *) bh->b_data;
 
         mlog_entry_void();
 
@@ -197,11 +198,27 @@ int ocfs2_update_inode_atime(struct inode *inode,
                 goto out;
         }
 
+        ret = ocfs2_journal_access(handle, inode, bh,
+                                   OCFS2_JOURNAL_ACCESS_WRITE);
+        if (ret) {
+                mlog_errno(ret);
+                goto out_commit;
+        }
+
+        /*
+         * Don't use ocfs2_mark_inode_dirty() here as we don't always
+         * have i_mutex to guard against concurrent changes to other
+         * inode fields.
+         */
         inode->i_atime = CURRENT_TIME;
-        ret = ocfs2_mark_inode_dirty(handle, inode, bh);
+        di->i_atime = cpu_to_le64(inode->i_atime.tv_sec);
+        di->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
+
+        ret = ocfs2_journal_dirty(handle, bh);
         if (ret < 0)
                 mlog_errno(ret);
 
+out_commit:
         ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
 out:
         mlog_exit(ret);
@@ -1011,6 +1028,11 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
         }
 
         if (size_change && attr->ia_size != i_size_read(inode)) {
+                if (attr->ia_size > sb->s_maxbytes) {
+                        status = -EFBIG;
+                        goto bail_unlock;
+                }
+
                 if (i_size_read(inode) > attr->ia_size)
                         status = ocfs2_truncate_file(inode, bh, attr->ia_size);
                 else
@@ -1516,7 +1538,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
         struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
         struct buffer_head *di_bh = NULL;
         handle_t *handle;
-        unsigned long long max_off = ocfs2_max_file_offset(inode->i_sb->s_blocksize_bits);
+        unsigned long long max_off = inode->i_sb->s_maxbytes;
 
         if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
                 return -EROFS;
@@ -1942,7 +1964,7 @@ static ssize_t ocfs2_file_buffered_write(struct file *file, loff_t *ppos,
                 }
 
                 dst = kmap_atomic(page, KM_USER0);
-                memcpy(dst + (pos & (PAGE_CACHE_SIZE - 1)), buf, bytes);
+                memcpy(dst + (pos & (loff_t)(PAGE_CACHE_SIZE - 1)), buf, bytes);
                 kunmap_atomic(dst, KM_USER0);
                 flush_dcache_page(page);
                 ocfs2_put_write_source(user_page);