Merge tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi

[cascardo/linux.git] / fs / ext4 / move_extent.c

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 503ea15..370420b 100644 (file)
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -267,7 +267,6 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode,
        handle_t *handle;
        ext4_lblk_t orig_blk_offset, donor_blk_offset;
        unsigned long blocksize = orig_inode->i_sb->s_blocksize;
-       unsigned int w_flags = 0;
        unsigned int tmp_data_size, data_size, replaced_size;
        int err2, jblocks, retries = 0;
        int replaced_count = 0;
@@ -288,9 +287,6 @@ again:
                return 0;
        }
 
-       if (segment_eq(get_fs(), KERNEL_DS))
-               w_flags |= AOP_FLAG_UNINTERRUPTIBLE;
-
        orig_blk_offset = orig_page_offset * blocks_per_page +
                data_offset_in_page;