From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263130AbTDRQA6 (ORCPT ); Fri, 18 Apr 2003 12:00:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263133AbTDRQA5 (ORCPT ); Fri, 18 Apr 2003 12:00:57 -0400 Received: from verein.lst.de ([212.34.181.86]:11277 "EHLO verein.lst.de") by vger.kernel.org with ESMTP id S263130AbTDRQAx (ORCPT ); Fri, 18 Apr 2003 12:00:53 -0400 Date: Fri, 18 Apr 2003 18:12:46 +0200 From: Christoph Hellwig To: torvalds@transmeta.com Cc: linux-kernel@vger.kernel.org Subject: [PATCH] devfs (1/7) - fix compilation Message-ID: <20030418181246.A363@lst.de> Mail-Followup-To: Christoph Hellwig , torvalds@transmeta.com, linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org As several people found out while I was asleep I sent you a bogus patch version and devfs didn't compile in your tree since then. Fix it. diff -Nru a/fs/devfs/base.c b/fs/devfs/base.c --- a/fs/devfs/base.c Fri Apr 18 15:56:18 2003 +++ b/fs/devfs/base.c Fri Apr 18 15:56:18 2003 @@ -1377,7 +1377,6 @@ * @uid: The user ID. * @gid: The group ID. * @fs_info: The filesystem info. - * @atomic: If TRUE, an atomic allocation is required. * * Returns %TRUE if an event was queued and devfsd woken up, else %FALSE. */ @@ -1423,7 +1422,7 @@ static void devfsd_notify (struct devfs_entry *de,unsigned short type) { devfsd_notify_de(de, type, de->mode, current->euid, - current->egid, &fs_info, 0); + current->egid, &fs_info); } @@ -1456,8 +1455,8 @@ dev_t devnum = 0, dev = MKDEV(major, minor); struct devfs_entry *de; - if (flags) - printk(KERN_ERR "%s called with flags != 0, please fix!\n"); + /* we don't accept any flags anymore. prototype will change soon. */ + BUG_ON(flags); if (name == NULL) {