Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 50375bb8e51d..42ae452b36b0 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -32,7 +32,7 @@ static int dev_mount = 1;
 static int dev_mount;
 #endif
 
-static rwlock_t dirlock;
+static DEFINE_MUTEX(dirlock);
 
 static int __init mount_param(char *str)
 {
@@ -93,7 +93,7 @@ static int create_path(const char *nodepath)
 {
         int err;
 
-        read_lock(&dirlock);
+        mutex_lock(&dirlock);
         err = dev_mkdir(nodepath, 0755);
         if (err == -ENOENT) {
                 char *path;
@@ -101,8 +101,10 @@ static int create_path(const char *nodepath)
 
                 /* parent directories do not exist, create them */
                 path = kstrdup(nodepath, GFP_KERNEL);
-                if (!path)
-                        return -ENOMEM;
+                if (!path) {
+                        err = -ENOMEM;
+                        goto out;
+                }
                 s = path;
                 for (;;) {
                         s = strchr(s, '/');
@@ -117,7 +119,8 @@ static int create_path(const char *nodepath)
                 }
                 kfree(path);
         }
-        read_unlock(&dirlock);
+out:
+        mutex_unlock(&dirlock);
         return err;
 }
 
@@ -229,7 +232,7 @@ static int delete_path(const char *nodepath)
         if (!path)
                 return -ENOMEM;
 
-        write_lock(&dirlock);
+        mutex_lock(&dirlock);
         for (;;) {
                 char *base;
 
@@ -241,7 +244,7 @@ static int delete_path(const char *nodepath)
                 if (err)
                         break;
         }
-        write_unlock(&dirlock);
+        mutex_unlock(&dirlock);
 
         kfree(path);
         return err;
@@ -351,8 +354,7 @@ int __init devtmpfs_init(void)
 {
         int err;
         struct vfsmount *mnt;
-
-        rwlock_init(&dirlock);
+        char options[] = "mode=0755";
 
         err = register_filesystem(&dev_fs_type);
         if (err) {
@@ -361,7 +363,7 @@ int __init devtmpfs_init(void)
                 return err;
         }
 
-        mnt = kern_mount_data(&dev_fs_type, "mode=0755");
+        mnt = kern_mount_data(&dev_fs_type, options);
         if (IS_ERR(mnt)) {
                 err = PTR_ERR(mnt);
                 printk(KERN_ERR "devtmpfs: unable to create devtmpfs %i\n", err);