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

Commit 34a9bff4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-3.14-rc2' of... 

Merge tag 'driver-core-3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fix from Greg KH:
 "Here is a single kernfs fix to resolve a much-reported lockdep issue
  with the removal of entries in sysfs"

* tag 'driver-core-3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP flag
parents 41f76d8b da9846ae

fs/kernfs/dir.c

+8 −4
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ static void kernfs_deactivate(struct kernfs_node *kn) 


	kn->u.completion = (void *)&wait;



	if (kn->flags & KERNFS_LOCKDEP)

		rwsem_acquire(&kn->dep_map, 0, 0, _RET_IP_);

	/* atomic_add_return() is a mb(), put_active() will always see

	 * the updated kn->u.completion.
@@ -194,13 +195,16 @@ static void kernfs_deactivate(struct kernfs_node *kn) 
	v = atomic_add_return(KN_DEACTIVATED_BIAS, &kn->active);



	if (v != KN_DEACTIVATED_BIAS) {

		if (kn->flags & KERNFS_LOCKDEP)

			lock_contended(&kn->dep_map, _RET_IP_);

		wait_for_completion(&wait);

	}



	if (kn->flags & KERNFS_LOCKDEP) {

		lock_acquired(&kn->dep_map, _RET_IP_);

		rwsem_release(&kn->dep_map, 1, _RET_IP_);

	}

}



/**

 * kernfs_get - get a reference count on a kernfs_node