diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2016-08-09 13:20:26 +0300 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-08-11 06:19:33 -0700 |
| commit | 3c41525001c49d7ada5f54bb3c97bf82909ee23e (patch) | |
| tree | d1ae27a0ad2ceb60a3702875565820f589ce6382 /api | |
| parent | 87bb8d0400d4ed18dd3954b1d9e5ca6ee0fb9742 (diff) | |
gfapi: add missing glfs_truncate
Change-Id: I80b016090a4d9d86278a0a5144dd58c0cbfe9bb2
BUG: 1365489
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Reviewed-on: http://review.gluster.org/13927
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'api')
| -rw-r--r-- | api/src/gfapi.aliases | 2 | ||||
| -rw-r--r-- | api/src/gfapi.map | 8 | ||||
| -rw-r--r-- | api/src/glfs-fops.c | 44 | ||||
| -rw-r--r-- | api/src/glfs.h | 2 |
4 files changed, 52 insertions, 4 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases index 4a8bdcfa2a4..365d170230b 100644 --- a/api/src/gfapi.aliases +++ b/api/src/gfapi.aliases @@ -33,7 +33,7 @@ _pub_glfs_pwritev _glfs_pwritev$GFAPI_3.4.0 _pub_glfs_preadv_async _glfs_preadv_async$GFAPI_3.4.0 _pub_glfs_pwritev_async _glfs_pwritev_async$GFAPI_3.4.0 _pub_glfs_lseek _glfs_lseek$GFAPI_3.4.0 -_pub_glfs_truncate _glfs_truncate$GFAPI_3.4.0 +_pub_glfs_truncate _glfs_truncate$GFAPI_3.7.15 _pub_glfs_ftruncate _glfs_ftruncate$GFAPI_3.4.0 _pub_glfs_ftruncate_async _glfs_ftruncate_async$GFAPI_3.4.0 _pub_glfs_lstat _glfs_lstat$GFAPI_3.4.0 diff --git a/api/src/gfapi.map b/api/src/gfapi.map index 37a26c66467..b03e6212694 100644 --- a/api/src/gfapi.map +++ b/api/src/gfapi.map @@ -39,7 +39,6 @@ GFAPI_3.4.0 { glfs_preadv_async; glfs_pwritev_async; glfs_lseek; - glfs_truncate; glfs_ftruncate; glfs_ftruncate_async; glfs_lstat; @@ -169,7 +168,12 @@ GFAPI_3.7.4 { glfs_h_lookupat; } GFAPI_PRIVATE_3.7.0; +GFAPI_3.7.15 { + global: + glfs_truncate; +} GFAPI_3.7.4; + GFAPI_4.0.0 { global: glfs_ipc; -} GFAPI_3.7.4; +} GFAPI_3.7.15; diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index dfa26aae82e..18bac8195d0 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -1570,6 +1570,50 @@ invalid_fs: GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_ftruncate, 3.4.0); +int +pub_glfs_truncate (struct glfs *fs, const char *path, off_t length) +{ + int ret = -1; + xlator_t *subvol = NULL; + loc_t loc = {0, }; + struct iatt iatt = {0, }; + int reval = 0; + + DECLARE_OLD_THIS; + __GLFS_ENTRY_VALIDATE_FS (fs, invalid_fs); + + subvol = glfs_active_subvol (fs); + if (!subvol) { + ret = -1; + errno = EIO; + goto out; + } +retry: + ret = glfs_resolve (fs, subvol, path, &loc, &iatt, reval); + + ESTALE_RETRY (ret, errno, reval, &loc, retry); + + if (ret) + goto out; + + ret = syncop_truncate (subvol, &loc, length, NULL, NULL); + DECODE_SYNCOP_ERR (ret); + + ESTALE_RETRY (ret, errno, reval, &loc, retry); +out: + loc_wipe (&loc); + + glfs_subvol_done (fs, subvol); + + __GLFS_EXIT_FS; + +invalid_fs: + return ret; +} + +GFAPI_SYMVER_PUBLIC_DEFAULT(glfs_truncate, 3.7.15); + + static int glfs_ftruncate_async_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, diff --git a/api/src/glfs.h b/api/src/glfs.h index 21dbc9b85ee..30600a79c32 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -560,7 +560,7 @@ off_t glfs_lseek (glfs_fd_t *fd, off_t offset, int whence) __THROW GFAPI_PUBLIC(glfs_lseek, 3.4.0); int glfs_truncate (glfs_t *fs, const char *path, off_t length) __THROW - GFAPI_PUBLIC(glfs_truncate, 3.4.0); + GFAPI_PUBLIC(glfs_truncate, 3.7.15); int glfs_ftruncate (glfs_fd_t *fd, off_t length) __THROW GFAPI_PUBLIC(glfs_ftruncate, 3.4.0); |