Commit 2e080de9 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jeff Garzik

[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.
parent e5b34c64
...@@ -1377,7 +1377,6 @@ static int wait_for_devfsd_finished (struct fs_info *fs_info) ...@@ -1377,7 +1377,6 @@ static int wait_for_devfsd_finished (struct fs_info *fs_info)
* @uid: The user ID. * @uid: The user ID.
* @gid: The group ID. * @gid: The group ID.
* @fs_info: The filesystem info. * @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. * 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, ...@@ -1423,7 +1422,7 @@ static int devfsd_notify_de (struct devfs_entry *de,
static void devfsd_notify (struct devfs_entry *de,unsigned short type) static void devfsd_notify (struct devfs_entry *de,unsigned short type)
{ {
devfsd_notify_de(de, type, de->mode, current->euid, 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, ...@@ -1456,8 +1455,8 @@ devfs_handle_t devfs_register (devfs_handle_t dir, const char *name,
dev_t devnum = 0, dev = MKDEV(major, minor); dev_t devnum = 0, dev = MKDEV(major, minor);
struct devfs_entry *de; struct devfs_entry *de;
if (flags) /* we don't accept any flags anymore. prototype will change soon. */
printk(KERN_ERR "%s called with flags != 0, please fix!\n"); WARN_ON(flags);
if (name == NULL) if (name == NULL)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment