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...
This commit is contained in:
@@ -1041,10 +1041,6 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
|
||||
|
||||
down_read(&mm->mmap_sem);
|
||||
|
||||
err = migrate_vmas(mm, from, to, flags);
|
||||
if (err)
|
||||
goto out;
|
||||
|
||||
/*
|
||||
* Find a 'source' bit set in 'tmp' whose corresponding 'dest'
|
||||
* bit in 'to' is not also set in 'tmp'. Clear the found 'source'
|
||||
@@ -1124,7 +1120,6 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
|
||||
if (err < 0)
|
||||
break;
|
||||
}
|
||||
out:
|
||||
up_read(&mm->mmap_sem);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
Reference in New Issue
Block a user