Merge branch 'upstream'

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index be12879bb179..010094d14da6 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -1532,7 +1532,7 @@ static ssize_t reiserfs_file_write(struct file *file,	/* the file we are going t
                 buf += write_bytes;
                 *ppos = pos += write_bytes;
                 count -= write_bytes;
-                balance_dirty_pages_ratelimited(inode->i_mapping);
+                balance_dirty_pages_ratelimited_nr(inode->i_mapping, num_pages);
         }
 
         /* this is only true on error */
@@ -1546,10 +1546,10 @@ static ssize_t reiserfs_file_write(struct file *file,	/* the file we are going t
                 }
         }
 
-        if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
-                res =
-                    generic_osync_inode(inode, file->f_mapping,
-                                        OSYNC_METADATA | OSYNC_DATA);
+        if (likely(res >= 0) &&
+            (unlikely((file->f_flags & O_SYNC) || IS_SYNC(inode))))
+                res = generic_osync_inode(inode, file->f_mapping,
+                                          OSYNC_METADATA | OSYNC_DATA);
 
         mutex_unlock(&inode->i_mutex);
         reiserfs_async_progress_wait(inode->i_sb);
@@ -1566,7 +1566,7 @@ static ssize_t reiserfs_aio_write(struct kiocb *iocb, const char __user * buf,
         return generic_file_aio_write(iocb, buf, count, pos);
 }
 
-struct file_operations reiserfs_file_operations = {
+const struct file_operations reiserfs_file_operations = {
         .read = generic_file_read,
         .write = reiserfs_file_write,
         .ioctl = reiserfs_ioctl,