ext4: fix copy paste error in ext4_swap_extents()

[sfrench/cifs-2.6.git] / fs / ext4 / extents.c

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index e0a8425ff74da9e60427f09f5525e1bc85952d51..97f0fd06728d7bb18bb05637db169cfeb91f9bcf 100644 (file)
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4652,7 +4652,7 @@ retry:
 
 static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
                                  ext4_lblk_t len, loff_t new_size,
-                                 int flags, int mode)
+                                 int flags)
 {
        struct inode *inode = file_inode(file);
        handle_t *handle;
@@ -4815,7 +4815,7 @@ static long ext4_zero_range(struct file *file, loff_t offset,
                                round_down(offset, 1 << blkbits) >> blkbits,
                                (round_up((offset + len), 1 << blkbits) -
                                 round_down(offset, 1 << blkbits)) >> blkbits,
-                               new_size, flags, mode);
+                               new_size, flags);
                if (ret)
                        goto out_dio;
 
@@ -4841,7 +4841,7 @@ static long ext4_zero_range(struct file *file, loff_t offset,
                inode->i_mtime = inode->i_ctime = current_time(inode);
 
                ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,
-                                            flags, mode);
+                                            flags);
                up_write(&EXT4_I(inode)->i_mmap_sem);
                if (ret)
                        goto out_dio;
@@ -4976,8 +4976,7 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
        ext4_inode_block_unlocked_dio(inode);
        inode_dio_wait(inode);
 
-       ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,
-                                    flags, mode);
+       ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size, flags);
        ext4_inode_resume_unlocked_dio(inode);
        if (ret)
                goto out;
@@ -5837,7 +5836,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
                        if (e1_blk > lblk1)
                                next1 = e1_blk;
                        if (e2_blk > lblk2)
-                               next2 = e1_blk;
+                               next2 = e2_blk;
                        /* Do we have something to swap */
                        if (next1 == EXT_MAX_BLOCKS || next2 == EXT_MAX_BLOCKS)
                                goto finish;