On Sat, Mar 01, 2014 at 08:52:42PM +0100, Jiri Slaby wrote: > On 03/01/2014 04:50 PM, Greg KH wrote: > > On Sat, Mar 01, 2014 at 01:10:32PM +0100, Jiri Slaby wrote: > >> From: Filipe David Borba Manana <fdmanana@xxxxxxxxx> > >> > >> This patch has been added to the 3.12 stable tree. If you have any > >> objections, please let us know. > >> > >> =============== > >> > >> In ctree.c:tree_mod_log_set_node_key() we were calling > >> __tree_mod_log_insert_key() even when the modification doesn't need > >> to be logged. This would allocate a tree_mod_elem structure, fill it > >> and pass it to __tree_mod_log_insert(), which would just acquire > >> the tree mod log write lock and then free the tree_mod_elem structure > >> and return (that is, a no-op). > >> > >> Therefore call tree_mod_log_insert() instead of __tree_mod_log_insert() > >> which just returns immediately if the modification doesn't need to be > >> logged (without allocating the structure, fill it, acquire write lock, > >> free structure). > >> > >> Signed-off-by: Filipe David Borba Manana <fdmanana@xxxxxxxxx> > >> Signed-off-by: Josef Bacik <jbacik@xxxxxx> > >> Signed-off-by: Chris Mason <clm@xxxxxx> > >> Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> > >> --- > > > > I don't see the upstream commit id in these patches, which is required > > to have in a stable patch. Can you add them to the commit in the format > > that I used, or in some standard format so that tools can check them? > > Yeah, I noticed that it was missing in the patches when I sent them. I > fixed it in my tree already. > > This is the SHAs of these 3 btrfs patches. IMHO, they should go to other > stable trees too: > 783577663507411e36e459390ef056556e93ef29 > 5de865eebb8330eee19c37b31fb6f315a09d4273 > a2aa75e18a21b21952dc6daa9bac7c9f4426f81f > > I planned to add all/most bugfixes from SLE _that satisfy the stable > rules_ to stable 3.12 and then walk through the SHAs and send them to > you guys to apply to other stable trees as well, if you are interested? > (These 3 are example of those.) Yes, I am very interested. I've grabbed these 3, but others would be great to have that you find. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html