Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  sysfs: don't warn on removal of a nonexistent binary file
  HOWTO: latest lxr url address changed
  HOWTO: korean translation of Documentation/HOWTO
  Fix Off-by-one in /sys/module/*/refcnt
  sysfs: fix locking in sysfs_lookup() and sysfs_rename_dir()

2 files changed, 13 insertions, 15 deletions

diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
index 135353f8a296..5afe2a26f5d8 100644
--- a/fs/sysfs/bin.c
+++ b/fs/sysfs/bin.c
@@ -248,12 +248,7 @@ int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr)
 
 void sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr)
 {
-        if (sysfs_hash_and_remove(kobj->sd, attr->attr.name) < 0) {
-                printk(KERN_ERR "%s: "
-                        "bad dentry or inode or no such file: \"%s\"\n",
-                        __FUNCTION__, attr->attr.name);
-                dump_stack();
-        }
+        sysfs_hash_and_remove(kobj->sd, attr->attr.name);
 }
 
 EXPORT_SYMBOL_GPL(sysfs_create_bin_file);
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 048e6054c2fd..83e76b3813c9 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -762,12 +762,15 @@ static int sysfs_count_nlink(struct sysfs_dirent *sd)
 static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
                                 struct nameidata *nd)
 {
+        struct dentry *ret = NULL;
         struct sysfs_dirent * parent_sd = dentry->d_parent->d_fsdata;
         struct sysfs_dirent * sd;
         struct bin_attribute *bin_attr;
         struct inode *inode;
         int found = 0;
 
+        mutex_lock(&sysfs_mutex);
+
         for (sd = parent_sd->s_children; sd; sd = sd->s_sibling) {
                 if (sysfs_type(sd) &&
                     !strcmp(sd->s_name, dentry->d_name.name)) {
@@ -778,14 +781,14 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
 
         /* no such entry */
         if (!found)
-                return NULL;
+                goto out_unlock;
 
         /* attach dentry and inode */
         inode = sysfs_get_inode(sd);
-        if (!inode)
-                return ERR_PTR(-ENOMEM);
-
-        mutex_lock(&sysfs_mutex);
+        if (!inode) {
+                ret = ERR_PTR(-ENOMEM);
+                goto out_unlock;
+        }
 
         if (inode->i_state & I_NEW) {
                 /* initialize inode according to type */
@@ -815,9 +818,9 @@ static struct dentry * sysfs_lookup(struct inode *dir, struct dentry *dentry,
         sysfs_instantiate(dentry, inode);
         sysfs_attach_dentry(sd, dentry);
 
+ out_unlock:
         mutex_unlock(&sysfs_mutex);
-
-        return NULL;
+        return ret;
 }
 
 const struct inode_operations sysfs_dir_inode_operations = {
@@ -942,6 +945,8 @@ int sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
         if (error)
                 goto out_drop;
 
+        mutex_lock(&sysfs_mutex);
+
         dup_name = sd->s_name;
         sd->s_name = new_name;
 
@@ -949,8 +954,6 @@ int sysfs_rename_dir(struct kobject *kobj, struct sysfs_dirent *new_parent_sd,
         d_add(new_dentry, NULL);
         d_move(sd->s_dentry, new_dentry);
 
-        mutex_lock(&sysfs_mutex);
-
         sysfs_unlink_sibling(sd);
         sysfs_get(new_parent_sd);
         sysfs_put(sd->s_parent);