Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

filestore: include <linux/falloc.h> #20415

Merged
merged 1 commit into from Feb 28, 2018

Conversation

Projects
None yet
4 participants
@wumingqiao
Copy link
Contributor

commented Feb 13, 2018

see #7768
because we neither define FALLOC_FL_KEEP_SIZE nor include linux/falloc.h,this pull actually disable punching hole.

Signed-off-by: wumingqiao wumingqiao@inspur.com

#ifndef FALLOC_FL_PUNCH_HOLE
# define FALLOC_FL_PUNCH_HOLE 0x2
#ifdef __linux__
#include <linux/falloc.h>

This comment has been minimized.

Copy link
@tchaikov

tchaikov Feb 14, 2018

Contributor

could you move this #include into FileStore.cc?

This comment has been minimized.

Copy link
@wumingqiao

wumingqiao Feb 22, 2018

Author Contributor

@tchaikov yes, I've done it.

@tchaikov tchaikov added the bug fix label Feb 14, 2018

@wumingqiao wumingqiao force-pushed the wumingqiao:wip-fallocate branch from 4fb0ba2 to e758b97 Feb 22, 2018

@tchaikov

This comment has been minimized.

Copy link
Contributor

commented Feb 22, 2018

@wumingqiao could you squash these two commits into a single one? and i think it will be ready for the rados qa run then.

@tchaikov tchaikov added needs-qa and removed needs-review labels Feb 22, 2018

filestore: include <linux/falloc.h>
see #7768
because we neither define FALLOC_FL_KEEP_SIZE nor include linux/falloc.h,this pull actually disable punching hole.

Signed-off-by: wumingqiao <wumingqiao@inspur.com>

@wumingqiao wumingqiao force-pushed the wumingqiao:wip-fallocate branch from e758b97 to 200904f Feb 22, 2018

@wumingqiao

This comment has been minimized.

Copy link
Contributor Author

commented Feb 22, 2018

@tchaikov Done as your wish.

@tchaikov tchaikov merged commit 5320a13 into ceph:master Feb 28, 2018

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.