]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13041 from SUSE/wip-18448-hammer hammer-next
authorNathan Cutler <presnypreklad@gmail.com>
Mon, 23 Jan 2017 16:49:54 +0000 (17:49 +0100)
committerGitHub <noreply@github.com>
Mon, 23 Jan 2017 16:49:54 +0000 (17:49 +0100)
hammer: osd: filestore: FALLOC_FL_PUNCH_HOLE must be used with FALLOC_FL_KEEP_SIZE

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge