linux-next: manual merge of the md-current tree with Linus' tree

linux-next: manual merge of the md-current tree with Linus' tree

[Stephen Rothwell]

Hi Neil,

Today's linux-next merge of the md-current tree got a conflict in
fs/compat_ioctl.c between commit 789f0f89118a80a3ff5309371e5820f623ed2a53
("compat_ioctl: simplify calling of handlers") from Linus' tree and
commit 22cc6029b064a3232d6b5a7c03c805ba02afc6db ("md: move compat_ioctl
handling into md.c") from the md-current tree.

I fixed it up (see below) and can carry the fix for a while  (a merge
with Linus' tree should fix it).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/compat_ioctl.c
index 278020d,ad485ba..0000000
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@@ -979,29 -1912,22 +979,11 @@@ COMPATIBLE_IOCTL(FIGETBSZ
  /* 'X' - originally XFS but some now in the VFS */
  COMPATIBLE_IOCTL(FIFREEZE)
  COMPATIBLE_IOCTL(FITHAW)
- /* RAID */
- COMPATIBLE_IOCTL(RAID_VERSION)
- COMPATIBLE_IOCTL(GET_ARRAY_INFO)
- COMPATIBLE_IOCTL(GET_DISK_INFO)
- COMPATIBLE_IOCTL(PRINT_RAID_DEBUG)
- COMPATIBLE_IOCTL(RAID_AUTORUN)
- COMPATIBLE_IOCTL(CLEAR_ARRAY)
- COMPATIBLE_IOCTL(ADD_NEW_DISK)
- COMPATIBLE_IOCTL(SET_ARRAY_INFO)
- COMPATIBLE_IOCTL(SET_DISK_INFO)
- COMPATIBLE_IOCTL(WRITE_RAID_INFO)
- COMPATIBLE_IOCTL(UNPROTECT_ARRAY)
- COMPATIBLE_IOCTL(PROTECT_ARRAY)
- COMPATIBLE_IOCTL(RUN_ARRAY)
- COMPATIBLE_IOCTL(STOP_ARRAY)
- COMPATIBLE_IOCTL(STOP_ARRAY_RO)
- COMPATIBLE_IOCTL(RESTART_ARRAY_RW)
- COMPATIBLE_IOCTL(GET_BITMAP_FILE)
 -/* Big K */
 -COMPATIBLE_IOCTL(PIO_FONT)
 -COMPATIBLE_IOCTL(GIO_FONT)
 -COMPATIBLE_IOCTL(PIO_CMAP)
 -COMPATIBLE_IOCTL(GIO_CMAP)
 -ULONG_IOCTL(KDSIGACCEPT)
  COMPATIBLE_IOCTL(KDGETKEYCODE)
  COMPATIBLE_IOCTL(KDSETKEYCODE)
 -ULONG_IOCTL(KIOCSOUND)
 -ULONG_IOCTL(KDMKTONE)
  COMPATIBLE_IOCTL(KDGKBTYPE)
 -ULONG_IOCTL(KDSETMODE)
  COMPATIBLE_IOCTL(KDGETMODE)
 -ULONG_IOCTL(KDSKBMODE)
  COMPATIBLE_IOCTL(KDGKBMODE)
 -ULONG_IOCTL(KDSKBMETA)
  COMPATIBLE_IOCTL(KDGKBMETA)
  COMPATIBLE_IOCTL(KDGKBENT)
  COMPATIBLE_IOCTL(KDSKBENT)

Re: linux-next: manual merge of the md-current tree with Linus' tree

[Arnd Bergmann]

On Monday 14 December 2009, Stephen Rothwell wrote:
> index 278020d,ad485ba..0000000
> --- a/fs/compat_ioctl.c
> +++ b/fs/compat_ioctl.c
> @@@ -979,29 -1912,22 +979,11 @@@ COMPATIBLE_IOCTL(FIGETBSZ
>   /* 'X' - originally XFS but some now in the VFS */
>   COMPATIBLE_IOCTL(FIFREEZE)
>   COMPATIBLE_IOCTL(FITHAW)
> - /* RAID */
> - COMPATIBLE_IOCTL(RAID_VERSION)
> - COMPATIBLE_IOCTL(GET_ARRAY_INFO)
> - COMPATIBLE_IOCTL(GET_DISK_INFO)
> - COMPATIBLE_IOCTL(PRINT_RAID_DEBUG)
> - COMPATIBLE_IOCTL(RAID_AUTORUN)
> - COMPATIBLE_IOCTL(CLEAR_ARRAY)
> - COMPATIBLE_IOCTL(ADD_NEW_DISK)
> - COMPATIBLE_IOCTL(SET_ARRAY_INFO)
> - COMPATIBLE_IOCTL(SET_DISK_INFO)
> - COMPATIBLE_IOCTL(WRITE_RAID_INFO)
> - COMPATIBLE_IOCTL(UNPROTECT_ARRAY)
> - COMPATIBLE_IOCTL(PROTECT_ARRAY)
> - COMPATIBLE_IOCTL(RUN_ARRAY)
> - COMPATIBLE_IOCTL(STOP_ARRAY)
> - COMPATIBLE_IOCTL(STOP_ARRAY_RO)
> - COMPATIBLE_IOCTL(RESTART_ARRAY_RW)
> - COMPATIBLE_IOCTL(GET_BITMAP_FILE)
>  -/* Big K */
>  -COMPATIBLE_IOCTL(PIO_FONT)
>  -COMPATIBLE_IOCTL(GIO_FONT)
>  -COMPATIBLE_IOCTL(PIO_CMAP)
>  -COMPATIBLE_IOCTL(GIO_CMAP)
>  -ULONG_IOCTL(KDSIGACCEPT)
>   COMPATIBLE_IOCTL(KDGETKEYCODE)
>   COMPATIBLE_IOCTL(KDSETKEYCODE)
>  -ULONG_IOCTL(KIOCSOUND)
>  -ULONG_IOCTL(KDMKTONE)
>   COMPATIBLE_IOCTL(KDGKBTYPE)
>  -ULONG_IOCTL(KDSETMODE)
>   COMPATIBLE_IOCTL(KDGETMODE)
>  -ULONG_IOCTL(KDSKBMODE)
>   COMPATIBLE_IOCTL(KDGKBMODE)
>  -ULONG_IOCTL(KDSKBMETA)
>   COMPATIBLE_IOCTL(KDGKBMETA)
>   COMPATIBLE_IOCTL(KDGKBENT)
>   COMPATIBLE_IOCTL(KDSKBENT)

This merge is incomplete, because the patch that I made for Neil
removes the handling for HOT_REMOVE_DISK, HOT_ADD_DISK,
SET_DISK_FAULTY and SET_BITMAP_FILE from fs/compat_ioctl.c
along with the others above, while my other patch that Linus
merged moves them into the switch statement in do_ioctl_trans.

Neil, still have  a tree where I track patches to fs/compat_ioctl.c
that have not yet been merged. If you just keep the half in your
own files and drop the ones in fs/compat_ioctl.c, I'll submit that
next time. You can also adapt the patch again to the new contents
and remove the four above to save me that work.

I didn't want to remove them from fs/compat_ioctl.c before they
got added to md.c, in order to keep bisection correct.

	Arnd

Re: linux-next: manual merge of the md-current tree with Linus' tree

[Neil Brown]

On Mon, 14 Dec 2009 11:27:26 +0100
Arnd Bergmann <arnd@arndb.de> wrote:

> Neil, still have  a tree where I track patches to fs/compat_ioctl.c
> that have not yet been merged. If you just keep the half in your
> own files and drop the ones in fs/compat_ioctl.c, I'll submit that
> next time. You can also adapt the patch again to the new contents
> and remove the four above to save me that work.
> 
> I didn't want to remove them from fs/compat_ioctl.c before they
> got added to md.c, in order to keep bisection correct.
> 
> 	Arnd


I had already rebased that patch on the lasted from Linus and asked him to
pull again.
He how seems to have done that, so md should be up-to-date in -linus,
including the compat_ioctl stuff.
If you would like to double check that it matches what you expect, that would
be great.

Thanks,
NeilBrown

Re: linux-next: manual merge of the md-current tree with Linus' tree

[Arnd Bergmann]

On Tuesday 15 December 2009, Neil Brown wrote:
> I had already rebased that patch on the lasted from Linus and asked him to
> pull again.
> He how seems to have done that, so md should be up-to-date in -linus,
> including the compat_ioctl stuff.
> If you would like to double check that it matches what you expect, that would
> be great.

The old ULONG_IOCTL numbers (HOT_{ADD,REMOVE}_DISK, SET_DISK_FAULTY
and SET_BITMAP_FILE) that Stephen missed are still left in fs/compat_ioctl.c,
but that is completely harmless. I'll remove them in my next batch of cleanups,
which can probably wait until 2.6.34.

Thanks for your help,

	Arnd