Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263005AbUKSB0r (ORCPT ); Thu, 18 Nov 2004 20:26:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261221AbUKSBMh (ORCPT ); Thu, 18 Nov 2004 20:12:37 -0500 Received: from www.ssc.unict.it ([151.97.230.9]:51206 "HELO ssc.unict.it") by vger.kernel.org with SMTP id S263005AbUKSBL7 (ORCPT ); Thu, 18 Nov 2004 20:11:59 -0500 Subject: [patch 3/4] uml: remove most devfs_mk_symlink calls To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, blaisorblade_spam@yahoo.it, hch@infradead.org, jdike@addtoit.com From: blaisorblade_spam@yahoo.it Date: Fri, 19 Nov 2004 02:13:37 +0100 Message-Id: <20041119011337.74CDD7B9C9@zion.localdomain> X-AntiVirus: checked by Vexira MailArmor (version: 2.0.1.16; VAE: 6.28.0.18; VDF: 6.28.0.80; host: ssc.unict.it) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2629 Lines: 68 Cc: Christoph Hellwig Remove uses of devfs_mk_symlink(). We didn't do this before to avoid breaking most user setups, but this patch should be quite harmless. I've excluded the hottest part, i.e. the ubd symlink, while removing the other; I released a end-user tree with this patch and there was a good number of people using the symlink rather than the preferred name. That part will be merged later, I think. Since now we have evidence of less and less users using devfs, we think that it will not cause too much problems. Acked-by: Jeff Dike Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- linux-2.6.10-rc-paolo/arch/um/drivers/line.c | 9 +-------- linux-2.6.10-rc-paolo/arch/um/drivers/mmapper_kern.c | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff -puN arch/um/drivers/line.c~uml-remove-most-devfs-mk-symlink arch/um/drivers/line.c --- linux-2.6.10-rc/arch/um/drivers/line.c~uml-remove-most-devfs-mk-symlink 2004-11-18 18:24:27.751930176 +0100 +++ linux-2.6.10-rc-paolo/arch/um/drivers/line.c 2004-11-18 18:24:27.755929568 +0100 @@ -415,8 +415,7 @@ struct tty_driver *line_register_devfs(s struct tty_operations *ops, struct line *lines, int nlines) { - int err, i; - char *from, *to; + int i; struct tty_driver *driver = alloc_tty_driver(nlines); if (!driver) @@ -436,12 +435,6 @@ struct tty_driver *line_register_devfs(s if (tty_register_driver(driver)) panic("line_register_devfs : Couldn't register driver\n"); - from = line_driver->symlink_from; - to = line_driver->symlink_to; - err = devfs_mk_symlink(from, to); - if(err) printk("Symlink creation from /dev/%s to /dev/%s " - "returned %d\n", from, to, err); - for(i = 0; i < nlines; i++){ if(!lines[i].valid) tty_unregister_device(driver, i); diff -puN arch/um/drivers/mmapper_kern.c~uml-remove-most-devfs-mk-symlink arch/um/drivers/mmapper_kern.c --- linux-2.6.10-rc/arch/um/drivers/mmapper_kern.c~uml-remove-most-devfs-mk-symlink 2004-11-18 18:24:27.753929872 +0100 +++ linux-2.6.10-rc-paolo/arch/um/drivers/mmapper_kern.c 2004-11-18 18:24:27.756929416 +0100 @@ -128,7 +128,6 @@ static int __init mmapper_init(void) p_buf = __pa(v_buf); devfs_mk_cdev(MKDEV(30, 0), S_IFCHR|S_IRUGO|S_IWUGO, "mmapper"); - devfs_mk_symlink("mmapper0", "mmapper"); return(0); } _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/