bitkeeper revision 1.878 (408cde49uOK-SAzfb5CBmpUoC0yXOg)

Dir renames.

19 files changed, 44 insertions, 44 deletions

diff --git a/.rootkeys b/.rootkeys
index f81687053e..74cc58825a 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -656,6 +656,18 @@
 40648526SxcA4lGIHB_k7ID8VlRSzw xenolinux-2.4.26-sparse/arch/xen/defconfig-physdev
 3e6377f5xwPfYZkPHPrDbEq1PRN7uQ xenolinux-2.4.26-sparse/arch/xen/drivers/balloon/Makefile
 3e6377f8Me8IqtvEhb70XFgOvqQH7A xenolinux-2.4.26-sparse/arch/xen/drivers/balloon/balloon.c
+4083dc16z0jvZEH4PiVDbDRreaNp6w xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/Makefile
+4083dc16KQus88a4U3uCV6qVCA6_8Q xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/Makefile
+4087cf0dPeHOvzmZAazvwLslKEF93A xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/common.h
+4087cf0da2cROOiybf9A-j4R_yHnjg xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/control.c
+4087cf0dvXL1PKX23t_LvO1wVPb7OA xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/interface.c
+4087cf0dkVF3I19gpT1cNubeJgQr7g xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/main.c
+4087cf0dlv1Dw4MAbeRStPPG8IvPPg xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/vbd.c
+40880cc6hHg6s2cPHbqPNQxENefjoQ xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/blkif.h
+4075806dI5kfeMD5RV-DA0PYoThx_w xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/Makefile
+4075806d3fJqqDC1pYYPTZPc575iKg xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/block.c
+4075806d4-j7vN0Mn0bklI1cRUX1vQ xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/block.h
+4075806dibjCcfuXv6CINMhxWTw3jQ xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/vbd.c
 3e5a4e65iHEuC5sjFhj42XALYbLVRw xenolinux-2.4.26-sparse/arch/xen/drivers/block/Makefile
 3e5a4e65pP5spJErBW69pJxSSdK9RA xenolinux-2.4.26-sparse/arch/xen/drivers/block/block.c
 3e67f822FOPwqHiaRKbrskgWgoNL5g xenolinux-2.4.26-sparse/arch/xen/drivers/block/block.h
@@ -667,25 +679,13 @@
 3e5a4e65gfn_ltB8ujHMVFApnTTNRQ xenolinux-2.4.26-sparse/arch/xen/drivers/dom0/vfr.c
 40420a6ebRqDjufoN1WSJvolEW2Wjw xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/Makefile
 40420a73Wou6JlsZDiu6YwjYomsm7A xenolinux-2.4.26-sparse/arch/xen/drivers/evtchn/evtchn.c
+4083dc16-Kd5y9psK_yk161sme5j5Q xenolinux-2.4.26-sparse/arch/xen/drivers/netif/Makefile
+4083dc16UmHXxS9g_UFVnkUpN-oP2Q xenolinux-2.4.26-sparse/arch/xen/drivers/netif/backend/Makefile
+4087cf0d5dudKw_DecIJgOhLlBF_0Q xenolinux-2.4.26-sparse/arch/xen/drivers/netif/backend/main.c
+405853f2wg7JXZJNltspMwOZJklxgw xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/Makefile
+405853f6nbeazrNyEWNHBuoSg2PiPA xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c
 3e5a4e65gZBRBB6RsSVg1c9iahigAw xenolinux-2.4.26-sparse/arch/xen/drivers/network/Makefile
 3e5a4e65ZxKrbFetVB84JhrTyZ1YuQ xenolinux-2.4.26-sparse/arch/xen/drivers/network/network.c
-4083dc16z0jvZEH4PiVDbDRreaNp6w xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
-4083dc16KQus88a4U3uCV6qVCA6_8Q xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/Makefile
-4087cf0dPeHOvzmZAazvwLslKEF93A xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/common.h
-4087cf0da2cROOiybf9A-j4R_yHnjg xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/control.c
-4087cf0dvXL1PKX23t_LvO1wVPb7OA xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/interface.c
-4087cf0dkVF3I19gpT1cNubeJgQr7g xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/main.c
-4087cf0dlv1Dw4MAbeRStPPG8IvPPg xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/vbd.c
-4075806dI5kfeMD5RV-DA0PYoThx_w xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/Makefile
-4075806d3fJqqDC1pYYPTZPc575iKg xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.c
-4075806d4-j7vN0Mn0bklI1cRUX1vQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.h
-4075806dibjCcfuXv6CINMhxWTw3jQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/vbd.c
-40880cc6hHg6s2cPHbqPNQxENefjoQ xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vblkif.h
-4083dc16-Kd5y9psK_yk161sme5j5Q xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
-4083dc16UmHXxS9g_UFVnkUpN-oP2Q xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/Makefile
-4087cf0d5dudKw_DecIJgOhLlBF_0Q xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/main.c
-405853f2wg7JXZJNltspMwOZJklxgw xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/Makefile
-405853f6nbeazrNyEWNHBuoSg2PiPA xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/vnetif.c
 3e5a4e65lWzkiPXsZdzPt2RNnJGG1g xenolinux-2.4.26-sparse/arch/xen/kernel/Makefile
 4075806dE5mQwlVUf8-t3YXjiMMWDQ xenolinux-2.4.26-sparse/arch/xen/kernel/ctrl_if.c
 3e5a4e65_hqfuxtGG8IUy6wRM86Ecg xenolinux-2.4.26-sparse/arch/xen/kernel/entry.S
diff --git a/xenolinux-2.4.26-sparse/arch/xen/Makefile b/xenolinux-2.4.26-sparse/arch/xen/Makefile
index 3abb3c7421..d799c003bb 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/Makefile
@@ -52,8 +52,8 @@ SUBDIRS += arch/xen/kernel arch/xen/mm arch/xen/lib
 SUBDIRS += arch/xen/drivers/console 
 SUBDIRS += arch/xen/drivers/evtchn
 ifdef CONFIG_XEN_NEWIO
-SUBDIRS += arch/xen/drivers/vblkif
-SUBDIRS += arch/xen/drivers/vnetif
+SUBDIRS += arch/xen/drivers/blkif
+SUBDIRS += arch/xen/drivers/netif
 else
 SUBDIRS += arch/xen/drivers/block
 SUBDIRS += arch/xen/drivers/network
@@ -67,8 +67,8 @@ CORE_FILES += arch/xen/kernel/kernel.o arch/xen/mm/mm.o
 CORE_FILES += arch/xen/drivers/evtchn/drv.o
 CORE_FILES += arch/xen/drivers/console/drv.o
 ifdef CONFIG_XEN_NEWIO
-CORE_FILES += arch/xen/drivers/vblkif/drv.o
-CORE_FILES += arch/xen/drivers/vnetif/drv.o
+CORE_FILES += arch/xen/drivers/blkif/drv.o
+CORE_FILES += arch/xen/drivers/netif/drv.o
 else
 CORE_FILES += arch/xen/drivers/block/drv.o
 CORE_FILES += arch/xen/drivers/network/drv.o
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/Makefile
index 20c8192d3d..20c8192d3d 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/Makefile
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/Makefile
index 4c8c17367c..4c8c17367c 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/Makefile
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/common.h b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/common.h
index 849ad1a1c7..4895172937 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/common.h
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/common.h
@@ -1,9 +1,9 @@
 /******************************************************************************
- * arch/xen/drivers/vblkif/backend/common.h
+ * arch/xen/drivers/blkif/backend/common.h
  */
 
-#ifndef __VBLKIF__BACKEND__COMMON_H__
-#define __VBLKIF__BACKEND__COMMON_H__
+#ifndef __BLKIF__BACKEND__COMMON_H__
+#define __BLKIF__BACKEND__COMMON_H__
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -12,7 +12,7 @@
 #include <linux/slab.h>
 #include <asm/ctrl_if.h>
 #include <asm/io.h>
-#include "../vblkif.h"
+#include "../blkif.h"
 
 #ifndef NDEBUG
 #define ASSERT(_p) \
@@ -91,8 +91,8 @@ typedef struct {
 
 int vbd_translate(phys_seg_t *pseg, blkif_t *blkif, int operation); 
 
-int vblkif_be_controller_init(void);
+int blkif_be_controller_init(void);
 
-void vblkif_be_int(int irq, void *dev_id, struct pt_regs *regs);
+void blkif_be_int(int irq, void *dev_id, struct pt_regs *regs);
 
-#endif /* __VBLKIF__BACKEND__COMMON_H__ */
+#endif /* __BLKIF__BACKEND__COMMON_H__ */
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/control.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/control.c
index 19c4d5b57c..c7ef10c3ba 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/control.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/control.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * arch/xen/drivers/vblkif/backend/control.c
+ * arch/xen/drivers/blkif/backend/control.c
  * 
  * Routines for interfacing with the control plane.
  * 
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/interface.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/interface.c
index 30e5c16409..579795deb9 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/interface.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/interface.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * arch/xen/drivers/vblkif/backend/interface.c
+ * arch/xen/drivers/blkif/backend/interface.c
  * 
  * Block-device interface management.
  * 
@@ -51,7 +51,7 @@ void blkif_create(blkif_create_t *create)
     spin_lock_init(&blkif->vbd_lock);
     spin_lock_init(&blkif->blk_ring_lock);
 
-    request_irq(irq, vblkif_be_int, 0, "vblkif-backend", blkif);
+    request_irq(irq, blkif_be_int, 0, "blkif-backend", blkif);
 
     blkif->hash_next = *pblkif;
     *pblkif = blkif;
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/main.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/main.c
index cb44ac173b..1e6190c3e6 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/main.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/main.c
@@ -1,11 +1,11 @@
 /******************************************************************************
- * arch/xen/drivers/vblkif/backend/main.c
+ * arch/xen/drivers/blkif/backend/main.c
  * 
  * Back-end of the driver for virtual block devices. This portion of the
  * driver exports a 'unified' block-device interface that can be accessed
  * by any operating system that implements a compatible front end. A 
  * reference front-end implementation can be found in:
- *  arch/xen/drivers/vblkif/frontend
+ *  arch/xen/drivers/blkif/frontend
  * 
  * Copyright (c) 2003-2004, Keir Fraser & Steve Hand
  */
@@ -187,7 +187,7 @@ static void end_block_io_op(struct buffer_head *bh, int uptodate)
  * NOTIFICATION FROM GUEST OS.
  */
 
-void vblkif_be_int(int irq, void *dev_id, struct pt_regs *regs)
+void blkif_be_int(int irq, void *dev_id, struct pt_regs *regs)
 {
     blkif_t *blkif = dev_id;
     add_to_blkdev_list_tail(blkif);
@@ -490,7 +490,7 @@ static int __init init_module(void)
     INIT_LIST_HEAD(&io_schedule_list);
 
     if ( request_irq(bind_virq_to_irq(VIRQ_DEBUG), blkif_debug_int, 
-                     SA_SHIRQ, "vblkif-backend-dbg", &blkif_debug_int) != 0 )
+                     SA_SHIRQ, "blkif-backend-dbg", &blkif_debug_int) != 0 )
         printk(KERN_WARNING "Non-fatal error -- no debug interrupt\n");
 
     buffer_head_cachep = kmem_cache_create(
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/vbd.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/vbd.c
index 2545c00d46..bd6c40125c 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/backend/vbd.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/backend/vbd.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * arch/xen/drivers/vblkif/backend/vbd.c
+ * arch/xen/drivers/blkif/backend/vbd.c
  * 
  * Routines for managing virtual block devices (VBDs).
  * 
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vblkif.h b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/blkif.h
index 9fded2bb90..f6e8a4d5c8 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/vblkif.h
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/blkif.h
@@ -1,13 +1,13 @@
 /******************************************************************************
- * vblkif.h
+ * blkif.h
  * 
  * Unified block-device I/O interface for Xen guest OSes.
  * 
  * Copyright (c) 2003-2004, Keir Fraser
  */
 
-#ifndef __SHARED_VBLKIF_H__
-#define __SHARED_VBLKIF_H__
+#ifndef __SHARED_BLKIF_H__
+#define __SHARED_BLKIF_H__
 
 #define blkif_vdev_t   u16
 #define blkif_sector_t u64
@@ -106,4 +106,4 @@ typedef struct {
     xen_sector_t   capacity;     /* Size in terms of 512-byte sectors.   */
 } vdisk_t;
 
-#endif /* __SHARED_VBLKIF_H__ */
+#endif /* __SHARED_BLKIF_H__ */
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/Makefile
index 35986ca54a..35986ca54a 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/Makefile
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/block.c
index d00dd98f7b..d00dd98f7b 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/block.c
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.h b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/block.h
index e41e03970e..e41e03970e 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/block.h
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/block.h
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/vbd.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/vbd.c
index e08b976c56..e08b976c56 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vblkif/frontend/vbd.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/blkif/frontend/vbd.c
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/Makefile
index 20c8192d3d..20c8192d3d 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/Makefile
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/backend/Makefile
index 032d02d7cc..032d02d7cc 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/backend/Makefile
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/main.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/backend/main.c
index b0e77ab522..dac8624879 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/backend/main.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/backend/main.c
@@ -1,11 +1,11 @@
 /******************************************************************************
- * arch/xen/drivers/vnetif/backend/main.c
+ * arch/xen/drivers/netif/backend/main.c
  * 
  * Back-end of the driver for virtual block devices. This portion of the
  * driver exports a 'unified' block-device interface that can be accessed
  * by any operating system that implements a compatible front end. A 
  * reference front-end implementation can be found in:
- *  arch/xen/drivers/vnetif/frontend
+ *  arch/xen/drivers/netif/frontend
  * 
  * Copyright (c) 2004, K A Fraser
  */
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/Makefile b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/Makefile
index 304c2e78ef..032d02d7cc 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/Makefile
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/Makefile
@@ -1,3 +1,3 @@
 O_TARGET := drv.o
-obj-y := vnetif.o
+obj-y := main.o
 include $(TOPDIR)/Rules.make
diff --git a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/vnetif.c b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c
index d1a4b21ad0..f2c36f1f88 100644
--- a/xenolinux-2.4.26-sparse/arch/xen/drivers/vnetif/frontend/vnetif.c
+++ b/xenolinux-2.4.26-sparse/arch/xen/drivers/netif/frontend/main.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * vnetif.c
+ * arch/xen/drivers/netif/frontend/main.c
  * 
  * Virtual network driver for XenoLinux.
  *