summaryrefslogtreecommitdiff
path: root/fs/devfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2003-04-17 19:19:14 -0700
committerJeff Garzik <jgarzik@redhat.com>2003-04-17 19:19:14 -0700
commit2e080de9cdcbbdf92a34894a0f11d6c7df7af468 (patch)
treea4af259e679c72fa00eedd7749c2048013960c74 /fs/devfs
parente5b34c64f93714a40881b6424637c14ece803619 (diff)
[PATCH] devfs: fix compilation
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.
Diffstat (limited to 'fs/devfs')
-rw-r--r--fs/devfs/base.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index 3b0ba59c8921..a2097d609e1c 100644
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -1377,7 +1377,6 @@ static int wait_for_devfsd_finished (struct fs_info *fs_info)
* @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 int devfsd_notify_de (struct devfs_entry *de,
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 @@ devfs_handle_t devfs_register (devfs_handle_t dir, const char *name,
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. */
+ WARN_ON(flags);
if (name == NULL)
{