diff options
| author | Brian Foster <bfoster@redhat.com> | 2013-05-23 12:19:42 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-06-13 14:37:43 -0700 |
| commit | 17f287172413dc04244781aa5302a0e4f10e2777 (patch) | |
| tree | 2acfc7097c92de32b19e82140befd8dc9fb2dad2 /xlators/mount | |
| parent | d1ccc4e400728d90f2ef7904661f53deb7199123 (diff) | |
glusterfs: discard (hole punch) support
Add support for the DISCARD file operation. Discard punches a hole
in a file in the provided range. Block de-allocation is implemented
via fallocate() (as requested via fuse and passed on to the brick
fs) but a separate fop is created within gluster to emphasize the
fact that discard changes file data (the discarded region is
replaced with zeroes) and must invalidate caches where appropriate.
BUG: 963678
Change-Id: I34633a0bfff2187afeab4292a15f3cc9adf261af
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-on: http://review.gluster.org/5090
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/mount')
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 59472b91485..1b97d4302c4 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -2669,10 +2669,13 @@ fuse_fallocate_resume(fuse_state_t *state) state->finh->unique, state->fd, state->flags, state->size, state->off); - /* we only support KEEP_SIZE */ - FUSE_FOP(state, fuse_fallocate_cbk, GF_FOP_FALLOCATE, fallocate, state->fd, - (state->flags & FALLOC_FL_KEEP_SIZE), state->off, state->size, - state->xdata); + if (state->flags & FALLOC_FL_PUNCH_HOLE) + FUSE_FOP(state, fuse_fallocate_cbk, GF_FOP_DISCARD, discard, + state->fd, state->off, state->size, state->xdata); + else + FUSE_FOP(state, fuse_fallocate_cbk, GF_FOP_FALLOCATE, fallocate, + state->fd, (state->flags & FALLOC_FL_KEEP_SIZE), + state->off, state->size, state->xdata); } static void @@ -2687,13 +2690,6 @@ fuse_fallocate(xlator_t *this, fuse_in_header_t *finh, void *msg) state->flags = ffi->mode; state->fd = FH_TO_FD(ffi->fh); - /* discard TBD as separate FOP */ - if (state->flags & FALLOC_FL_PUNCH_HOLE) { - send_fuse_err(this, finh, EOPNOTSUPP); - free_fuse_state(state); - return; - } - fuse_resolve_fd_init(state, &state->resolve, state->fd); fuse_resolve_and_resume(state, fuse_fallocate_resume); } |