Re: [PATCH driver-core-next] kernfs: fix hash calculation in kernfs_rename_ns()

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Mon, Feb 10, 2014 at 05:57:09PM -0500, Tejun Heo wrote:
> 3eef34ad7dc3 ("kernfs: implement kernfs_get_parent(),
> kernfs_name/path() and friends") restructured kernfs_rename_ns() such
> that new name assignment happens under kernfs_rename_lock;
> unfortunately, it mistakenly passed NULL to kernfs_name_hash() to
> calculate the new hash if the name hasn't changed, which can lead to
> oops.
> 
> Fix it by using kn->name and kn->ns when calculating the new hash.

Now applied, thanks.

Also, can you look into the merge of 3.14-rc2 into the driver-core-next
branch?  There are some conflicts in the kernfs code due to the lockdep
changes that I couldn't easily verify I got right, so I didn't do the
merge.  Could you give me a diff of the merge for me to work off of?

thanks,

greg k-h