Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs pile #3 from Al Viro:
 "Assorted fixes and patches from the last cycle"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [regression] chunk lost from bd9b51
  vfs: make mounts and mountstats honor root dir like mountinfo does
  vfs: cleanup show_mountinfo
  init: fix read-write root mount
  unfuck binfmt_misc.c (broken by commit e6084d4)
  vm_area_operations: kill ->migrate()
  new helper: iter_is_iovec()
  move_extent_per_page(): get rid of unused w_flags
  lustre: get rid of playing with ->fs
  btrfs: filp_open() returns ERR_PTR() on failure, not NULL...

1 files changed, 0 insertions, 4 deletions

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 503ea15dc5db..370420bfae8d 100644
--- 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;