Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac019151 authored by Corey Minyard's avatar Corey Minyard Committed by Linus Torvalds
Browse files

IPMI: fix hotmod remove lock 



The removal of proc entries was done holding a lock, which is no longer
allowed.  There is no need for the lock, only a mutex is required, so switch
over to a mutex.

Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 612b5a8d

drivers/char/ipmi/ipmi_msghandler.c

+7 −9
Original line number Diff line number Diff line
@@ -221,10 +221,8 @@ struct ipmi_smi 
	void                     *send_info;



#ifdef CONFIG_PROC_FS

	/* A list of proc entries for this interface.  This does not

	   need a lock, only one thread creates it and only one thread

	   destroys it. */

	spinlock_t             proc_entry_lock;

	/* A list of proc entries for this interface. */

	struct mutex           proc_entry_lock;

	struct ipmi_proc_entry *proc_entries;

#endif
@@ -1891,11 +1889,11 @@ int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name, 
		file->write_proc = write_proc;

		file->owner = owner;



		spin_lock(&smi->proc_entry_lock);

		mutex_lock(&smi->proc_entry_lock);

		/* Stick it on the list. */

		entry->next = smi->proc_entries;

		smi->proc_entries = entry;

		spin_unlock(&smi->proc_entry_lock);

		mutex_unlock(&smi->proc_entry_lock);

	}

#endif /* CONFIG_PROC_FS */
@@ -1939,7 +1937,7 @@ static void remove_proc_entries(ipmi_smi_t smi) 
#ifdef CONFIG_PROC_FS

	struct ipmi_proc_entry *entry;



	spin_lock(&smi->proc_entry_lock);

	mutex_lock(&smi->proc_entry_lock);

	while (smi->proc_entries) {

		entry = smi->proc_entries;

		smi->proc_entries = entry->next;
@@ -1948,7 +1946,7 @@ static void remove_proc_entries(ipmi_smi_t smi) 
		kfree(entry->name);

		kfree(entry);

	}

	spin_unlock(&smi->proc_entry_lock);

	mutex_unlock(&smi->proc_entry_lock);

	remove_proc_entry(smi->proc_dir_name, proc_ipmi_root);

#endif /* CONFIG_PROC_FS */

}
@@ -2679,7 +2677,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers, 
	}

	intf->curr_seq = 0;

#ifdef CONFIG_PROC_FS

	spin_lock_init(&intf->proc_entry_lock);

	mutex_init(&intf->proc_entry_lock);

#endif

	spin_lock_init(&intf->waiting_msgs_lock);

	INIT_LIST_HEAD(&intf->waiting_msgs);