patch-2.4.0-test2 linux/include/linux/devfs_fs_kernel.h

• Lines: 56
• Date: Fri Jun 23 21:30:33 2000
• Orig file: v2.4.0-test1/linux/include/linux/devfs_fs_kernel.h
• Orig date: Tue Mar 7 14:32:26 2000

diff -u --recursive --new-file v2.4.0-test1/linux/include/linux/devfs_fs_kernel.h linux/include/linux/devfs_fs_kernel.h
@@ -35,6 +35,7 @@
 #define DEVFS_FL_REMOVABLE      0x020 /* This is a removable media device    */
 #define DEVFS_FL_WAIT           0x040 /* Wait for devfsd to finish           */
 #define DEVFS_FL_NO_PERSISTENCE 0x080 /* Forget changes after unregister     */
+#define DEVFS_FL_CURRENT_OWNER  0x100 /* Set initial ownership to current    */
 #define DEVFS_FL_DEFAULT        DEVFS_FL_NONE
 
 
@@ -52,12 +53,10 @@
 
 
 #ifdef CONFIG_DEVFS_FS
-extern devfs_handle_t devfs_register (devfs_handle_t dir,
-				      const char *name, unsigned int namelen,
+extern devfs_handle_t devfs_register (devfs_handle_t dir, const char *name,
 				      unsigned int flags,
 				      unsigned int major, unsigned int minor,
-				      umode_t mode, uid_t uid, gid_t gid,
-				      void *ops, void *info);
+				      umode_t mode, void *ops, void *info);
 extern void devfs_unregister (devfs_handle_t de);
 extern int devfs_mk_symlink (devfs_handle_t dir,
 			     const char *name, unsigned int namelen,
@@ -98,8 +97,7 @@
 				   unsigned int num_entries,
 				   unsigned int flags, unsigned int major,
 				   unsigned int minor_start,
-				   umode_t mode, uid_t uid, gid_t gid,
-				   void *ops, void *info);
+				   umode_t mode, void *ops, void *info);
 
 extern int init_devfs_fs (void);
 extern void mount_devfs_fs (void);
@@ -107,12 +105,10 @@
 #else  /*  CONFIG_DEVFS_FS  */
 static inline devfs_handle_t devfs_register (devfs_handle_t dir,
 					     const char *name,
-					     unsigned int namelen,
 					     unsigned int flags,
 					     unsigned int major,
 					     unsigned int minor,
 					     umode_t mode,
-					     uid_t uid, gid_t gid,
 					     void *ops, void *info)
 {
     return NULL;
@@ -239,8 +235,7 @@
 					  unsigned int flags,
 					  unsigned int major,
 					  unsigned int minor_start,
-					  umode_t mode, uid_t uid, gid_t gid,
-					  void *ops, void *info)
+					  umode_t mode, void *ops, void *info)
 {
     return;
 }