patch-2.3.99-pre9 linux/arch/sparc64/kernel/ioctl32.c

• Lines: 65
• Date: Mon May 22 09:50:54 2000
• Orig file: v2.3.99-pre8/linux/arch/sparc64/kernel/ioctl32.c
• Orig date: Thu May 11 15:30:06 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/arch/sparc64/kernel/ioctl32.c linux/arch/sparc64/kernel/ioctl32.c
@@ -1,4 +1,4 @@
-/* $Id: ioctl32.c,v 1.89 2000/05/06 10:38:42 davem Exp $
+/* $Id: ioctl32.c,v 1.90 2000/05/22 07:29:39 davem Exp $
  * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
  *
  * Copyright (C) 1997-2000  Jakub Jelinek  (jakub@redhat.com)
@@ -2400,39 +2400,6 @@
 	return err;
 }
 
-typedef struct blkelv_ioctl32_arg_s {
-	u32 queue_ID;
-	int read_latency;
-	int write_latency;
-	int max_bomb_segments;
-} blkelv_ioctl32_arg_t;
-
-static int do_blkelv_ioctl(unsigned int fd, unsigned int cmd, blkelv_ioctl32_arg_t *arg)
-{
-	blkelv_ioctl_arg_t b;
-	int err;
-	mm_segment_t old_fs = get_fs();
-
-	if (cmd == BLKELVSET) {	
-		err = get_user((long)b.queue_ID, &arg->queue_ID);
-		err |= __get_user(b.read_latency, &arg->read_latency);
-		err |= __get_user(b.write_latency, &arg->write_latency);
-		err |= __get_user(b.max_bomb_segments, &arg->max_bomb_segments);
-		if (err) return err;
-	}
-	set_fs (KERNEL_DS);
-	err = sys_ioctl(fd, cmd, (unsigned long)&b);
-	set_fs (old_fs);
-	if (cmd == BLKELVGET && !err) {
-		err = put_user((long)b.queue_ID, &arg->queue_ID);
-		err |= __put_user(b.read_latency, &arg->read_latency);
-		err |= __put_user(b.write_latency, &arg->write_latency);
-		err |= __put_user(b.max_bomb_segments, &arg->max_bomb_segments);
-		if (err) return err;
-	}
-	return err;
-}
-
 static int ioc_settimeout(unsigned int fd, unsigned int cmd, unsigned long arg)
 {
 	return rw_long(fd, AUTOFS_IOC_SETTIMEOUT, arg);
@@ -2994,6 +2961,9 @@
 COMPATIBLE_IOCTL(LV_SET_STATUS)
 COMPATIBLE_IOCTL(LV_SET_ALLOCATION)
 #endif /* LVM */
+/* elevator */
+COMPATIBLE_IOCTL(BLKELVGET)
+COMPATIBLE_IOCTL(BLKELVSET)
 /* And these ioctls need translation */
 HANDLE_IOCTL(SIOCGIFNAME, dev_ifname32)
 HANDLE_IOCTL(SIOCGIFCONF, dev_ifconf)
@@ -3040,8 +3010,6 @@
 HANDLE_IOCTL(BLKFRAGET, w_long)
 HANDLE_IOCTL(BLKSECTGET, w_long)
 HANDLE_IOCTL(BLKPG, blkpg_ioctl_trans)
-HANDLE_IOCTL(BLKELVGET, do_blkelv_ioctl)
-HANDLE_IOCTL(BLKELVSET, do_blkelv_ioctl)
 HANDLE_IOCTL(FBIOPUTCMAP32, fbiogetputcmap)
 HANDLE_IOCTL(FBIOGETCMAP32, fbiogetputcmap)
 HANDLE_IOCTL(FBIOSCURSOR32, fbiogscursor)