]> git.hungrycats.org Git - linux/commitdiff
Merge commit '77f51b4266f94a1d72e00a64458d39aefd701985' into zygo-3.18.11-zb64-btrfs
authorZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 17 Apr 2015 16:32:59 +0000 (12:32 -0400)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Fri, 17 Apr 2015 16:32:59 +0000 (12:32 -0400)
This commit seems to disappear:

commit ac4b500278bff89780c9fa01f2d6eb3053ad7e51
Author: David Sterba <dsterba@suse.cz>
Date:   Fri Jan 2 19:36:14 2015 +0100

    btrfs: expand btrfs_find_item if found_key is NULL

    If the found_key is NULL, then btrfs_find_item becomes a verbose wrapper
    for simple btrfs_search_slot.

    After we've removed all such callers, passing a NULL key is not valid
    anymore.

Signed-off-by: David Sterba <dsterba@suse.cz>
    (cherry picked from commit 1d4c08e0a60be356134d0c466744d0d4e16ebab0)


Trivial merge