[PATCH] remove DEVFS_FL_*

Okay, all flags are gone from devfs callers, time to remove the gunk
handling it.  devfs_register prototype will change later.

diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index 66a65f26bce9b0c180ba92b7382937736032a2b8..3b0ba59c8921785e69add6d5e5dce1f710d95b29 100644 (file)
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -1384,16 +1384,13 @@ static int wait_for_devfsd_finished (struct fs_info *fs_info)
 
 static int devfsd_notify_de (struct devfs_entry *de,
                             unsigned short type, umode_t mode,
-                            uid_t uid, gid_t gid, struct fs_info *fs_info,
-                            int atomic)
+                            uid_t uid, gid_t gid, struct fs_info *fs_info)
 {
     struct devfsd_buf_entry *entry;
     struct devfs_entry *curr;
 
     if ( !( fs_info->devfsd_event_mask & (1 << type) ) ) return (FALSE);
-    if ( ( entry = kmem_cache_alloc (devfsd_buf_cache,
-                                    atomic ? SLAB_ATOMIC : SLAB_KERNEL) )
-        == NULL )
+    if ( ( entry = kmem_cache_alloc (devfsd_buf_cache, SLAB_KERNEL) ) == NULL )
     {
        atomic_inc (&fs_info->devfsd_overrun_count);
        return (FALSE);
@@ -1423,12 +1420,11 @@ static int devfsd_notify_de (struct devfs_entry *de,
  *             the event.
  */
 
-static void devfsd_notify (struct devfs_entry *de,unsigned short type,int wait)
+static void devfsd_notify (struct devfs_entry *de,unsigned short type)
 {
-    if (devfsd_notify_de (de, type, de->mode, current->euid,
-                         current->egid, &fs_info, 0) && wait)
-       wait_for_devfsd_finished (&fs_info);
-}   /*  End Function devfsd_notify  */
+       devfsd_notify_de(de, type, de->mode, current->euid,
+                        current->egid, &fs_info, 0);
+} 
 
 
 /**
@@ -1436,7 +1432,7 @@ static void devfsd_notify (struct devfs_entry *de,unsigned short type,int wait)
  *     @dir: The handle to the parent devfs directory entry. If this is %NULL the
  *             new name is relative to the root of the devfs.
  *     @name: The name of the entry.
- *     @flags: A set of bitwise-ORed flags (DEVFS_FL_*).
+ *     @flags: Must be 0
  *     @major: The major number. Not needed for regular files.
  *     @minor: The minor number. Not needed for regular files.
  *     @mode: The default file mode.
@@ -1460,6 +1456,9 @@ 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");
+
     if (name == NULL)
     {
        PRINTK ("(): NULL name pointer\n");
@@ -1501,16 +1500,8 @@ devfs_handle_t devfs_register (devfs_handle_t dir, const char *name,
        return (NULL);
     }
     de->info = info;
-    if (flags & DEVFS_FL_CURRENT_OWNER)
-    {
-       de->inode.uid = current->uid;
-       de->inode.gid = current->gid;
-    }
-    else
-    {
-       de->inode.uid = 0;
-       de->inode.gid = 0;
-    }
+    de->inode.uid = 0;
+    de->inode.gid = 0;
     err = _devfs_append_entry(dir, de, NULL);
     if (err)
     {
@@ -1521,7 +1512,7 @@ devfs_handle_t devfs_register (devfs_handle_t dir, const char *name,
     }
     DPRINTK (DEBUG_REGISTER, "(%s): de: %p dir: %p \"%s\"  pp: %p\n",
             name, de, dir, dir->name, dir->parent);
-    devfsd_notify (de, DEVFSD_NOTIFY_REGISTERED, flags & DEVFS_FL_WAIT);
+    devfsd_notify (de, DEVFSD_NOTIFY_REGISTERED);
     devfs_put (dir);
     return de;
 }   /*  End Function devfs_register  */
@@ -1568,7 +1559,7 @@ static void _devfs_unregister (struct devfs_entry *dir, struct devfs_entry *de)
     write_unlock (&dir->u.dir.lock);
     if (!unhooked) return;
     devfs_get (dir);
-    devfsd_notify (de, DEVFSD_NOTIFY_UNREGISTERED, 0);
+    devfsd_notify (de, DEVFSD_NOTIFY_UNREGISTERED);
     free_dentry (de);
     devfs_put (dir);
     if ( !S_ISDIR (de->mode) ) return;
@@ -1673,7 +1664,7 @@ int devfs_mk_symlink(const char *from, const char *to)
        err = devfs_do_symlink(NULL, from, to, &de);
        if (!err) {
                de->vfs_deletable = TRUE;
-               devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED, 0);
+               devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED);
        }
 
        return err;
@@ -1722,7 +1713,7 @@ devfs_handle_t devfs_mk_dir(const char *fmt, ...)
        
        DPRINTK(DEBUG_REGISTER, "(%s): de: %p dir: %p \"%s\"\n",
                        buf, de, dir, dir->name);
-       devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED, 0);
+       devfsd_notify(de, DEVFSD_NOTIFY_REGISTERED);
 
  out_put:
        devfs_put(dir);
@@ -1906,7 +1897,7 @@ static int try_modload (struct devfs_entry *parent, struct fs_info *fs_info,
     buf->u.name = name;
     WRITE_ENTRY_MAGIC (buf, MAGIC_VALUE);
     if ( !devfsd_notify_de (buf, DEVFSD_NOTIFY_LOOKUP, 0,
-                           current->euid, current->egid, fs_info, 0) )
+                           current->euid, current->egid, fs_info) )
        return -ENOENT;
     /*  Possible success: event has been queued  */
     return 0;
@@ -1949,7 +1940,7 @@ static int devfs_notify_change (struct dentry *dentry, struct iattr *iattr)
     if ( ( iattr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID) ) &&
         !is_devfsd_or_child (fs_info) )
        devfsd_notify_de (de, DEVFSD_NOTIFY_CHANGE, inode->i_mode,
-                         inode->i_uid, inode->i_gid, fs_info, 0);
+                         inode->i_uid, inode->i_gid, fs_info);
     return 0;
 }   /*  End Function devfs_notify_change  */
 
@@ -2376,7 +2367,7 @@ static int devfs_unlink (struct inode *dir, struct dentry *dentry)
     if (!unhooked) return -ENOENT;
     if ( !is_devfsd_or_child (fs_info) )
        devfsd_notify_de (de, DEVFSD_NOTIFY_DELETE, inode->i_mode,
-                         inode->i_uid, inode->i_gid, fs_info, 0);
+                         inode->i_uid, inode->i_gid, fs_info);
     free_dentry (de);
     devfs_put (de);
     return 0;
@@ -2410,7 +2401,7 @@ static int devfs_symlink (struct inode *dir, struct dentry *dentry,
     d_instantiate (dentry, inode);
     if ( !is_devfsd_or_child (fs_info) )
        devfsd_notify_de (de, DEVFSD_NOTIFY_CREATE, inode->i_mode,
-                         inode->i_uid, inode->i_gid, fs_info, 0);
+                         inode->i_uid, inode->i_gid, fs_info);
     return 0;
 }   /*  End Function devfs_symlink  */
 
@@ -2441,7 +2432,7 @@ static int devfs_mkdir (struct inode *dir, struct dentry *dentry, int mode)
     d_instantiate (dentry, inode);
     if ( !is_devfsd_or_child (fs_info) )
        devfsd_notify_de (de, DEVFSD_NOTIFY_CREATE, inode->i_mode,
-                         inode->i_uid, inode->i_gid, fs_info, 0);
+                         inode->i_uid, inode->i_gid, fs_info);
     return 0;
 }   /*  End Function devfs_mkdir  */
 
@@ -2470,7 +2461,7 @@ static int devfs_rmdir (struct inode *dir, struct dentry *dentry)
     if (err) return err;
     if ( !is_devfsd_or_child (fs_info) )
        devfsd_notify_de (de, DEVFSD_NOTIFY_DELETE, inode->i_mode,
-                         inode->i_uid, inode->i_gid, fs_info, 0);
+                         inode->i_uid, inode->i_gid, fs_info);
     free_dentry (de);
     devfs_put (de);
     return 0;
@@ -2509,7 +2500,7 @@ static int devfs_mknod (struct inode *dir, struct dentry *dentry, int mode,
     d_instantiate (dentry, inode);
     if ( !is_devfsd_or_child (fs_info) )
        devfsd_notify_de (de, DEVFSD_NOTIFY_CREATE, inode->i_mode,
-                         inode->i_uid, inode->i_gid, fs_info, 0);
+                         inode->i_uid, inode->i_gid, fs_info);
     return 0;
 }   /*  End Function devfs_mknod  */
 

diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
index f484bc34339d8879b42d9b0ccd8f6f651a89d224..e7eea3cb3b126916dcb6837233540da60e9a42d9 100644 (file)
--- a/include/linux/devfs_fs_kernel.h
+++ b/include/linux/devfs_fs_kernel.h
@@ -12,9 +12,7 @@
 #define DEVFS_SUPER_MAGIC                0x1373
 
 #define DEVFS_FL_NONE           0x000 /* This helps to make code more readable
-                                      */
-#define DEVFS_FL_WAIT           0x010 /* Wait for devfsd to finish           */
-#define DEVFS_FL_CURRENT_OWNER  0x020 /* Set initial ownership to current    */
+                                        no, it doesn't  --hch */
 #define DEVFS_FL_DEFAULT        DEVFS_FL_NONE