Skip to contentSkip to conversation

Patch: linux-2.5.59/fs/devfs shrink

DISCUSSION Adam J. Richter 1 participant 1 message Jan 18, 2003

lore
Share & tools
lore

Adam J. Richter

author
#0 lore raw

Many thanks to Andrew Morton for a patch to my devfs shrink
that fixes premature unlocking of an inode, eliminates a redundant "if (err)", and removes an incorrect comment. I'm running with Andrew's changes now, and I've put up a new diff against 2.5.59 so that everyone can be up to date, at the following URL.

ftp://ftp.yggdrasil.com/pub/dist/device_control/devfs/smalldevfs-2.5.59-v9.patch

Just for completeness, here is the URL for devfs_helper (no change):

ftp://ftp.yggdrasil.com/pub/dist/device_control/devfs/devfs_helper-0.2.tar.gz

Also for completeness, I've appended a copy of Andrew's diff.

Adam J. Richter     __     ______________   575 Oroville Road
[email protected]     \ /                  Milpitas, California 95035
+1 408 309-6081         | g g d r a s i l   United States of America

"Free Software For The Rest Of Us."

 devfs/base.c |   11 ++++-------
 devfs/fs.c   |    0 
 2 files changed, 4 insertions(+), 7 deletions(-)
fs/devfs/base.c renamed from fs/devfs/base.c~a +4 -7
diff -puN fs/devfs/base.c~a fs/devfs/base.c
@@ -48,7 +48,6 @@ extern int __init init_devfs_fs(void);
    different interface from lookup_create. */
 extern struct dentry *lookup_create(struct nameidata *nd, int is_dir);
 
-/* Called and returns with dcache_lock held.  */
 static int walk_parents_mkdir(const char **path, struct nameidata *nd,
 			      int is_dir)
 {

@@ -78,10 +77,8 @@ static int walk_parents_mkdir(const char
 		
 		up(&nd->dentry->d_parent->d_inode->i_sem);
 
-		if (err) {
-			if (err)
-				return err;
-		}
+		if (err)
+			return err;
 
 		*path += len + 1;
 	}

@@ -156,7 +153,6 @@ devfs_handle_t devfs_register (devfs_han
 		goto err_free_devnum;
 
 	err = vfs_mknod(parent_inode, dentry, mode, devnum);
-	up(&parent_inode->i_sem);
 	if (!err) {
 		/* FIXME? Is DEVFS_FL_CURRENT_OWNER useful?  Don't we
 		   already set uid and gid to current->fs{uid,gid}?  */

@@ -164,8 +160,10 @@ devfs_handle_t devfs_register (devfs_han
 			dentry->d_inode->i_uid = current->uid;
 			dentry->d_inode->i_gid = current->gid;
 		}
+		up(&parent_inode->i_sem);
 		return dentry;
 	}
+	up(&parent_inode->i_sem);
 
 	dput(dentry);
 

@@ -259,7 +257,6 @@ void devfs_remove(const char *fmt, ...)
 		devfs_put(nd.dentry);
 	}
 }
-
 EXPORT_SYMBOL(devfs_remove);
 
 int devfs_only(void)

diff -puN fs/devfs/fs.c~a fs/devfs/fs.c

_