linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / reiserfs / file.c

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 0eea8b4..db38c09 100644 (file)
--- 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_nr(inode->i_mapping, num_pages);
+               balance_dirty_pages_ratelimited(inode->i_mapping);
        }
 
        /* 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 (likely(res >= 0) &&
-           (unlikely((file->f_flags & O_SYNC) || IS_SYNC(inode))))
-               res = generic_osync_inode(inode, file->f_mapping,
-                                         OSYNC_METADATA | OSYNC_DATA);
+       if ((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);
 }
 
-const struct file_operations reiserfs_file_operations = {
+struct file_operations reiserfs_file_operations = {
        .read = generic_file_read,
        .write = reiserfs_file_write,
        .ioctl = reiserfs_ioctl,
@@ -1576,8 +1576,6 @@ const struct file_operations reiserfs_file_operations = {
        .sendfile = generic_file_sendfile,
        .aio_read = generic_file_aio_read,
        .aio_write = reiserfs_aio_write,
-       .splice_read = generic_file_splice_read,
-       .splice_write = generic_file_splice_write,
 };
 
 struct inode_operations reiserfs_file_inode_operations = {