summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2016-08-09 13:20:26 +0300
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-08-12 04:19:31 -0700
commit878ec562448366587aad38bb2c6271b3c86b62c2 (patch)
treee7747937044571a6b30b995861e7cdd3bcd86eba /api
parent64f1a0132f775f8eb21612e5f32e4b842ace435b (diff)
gfapi: add missing glfs_truncate
> 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> BUG: 1366286 Change-Id: I80b016090a4d9d86278a0a5144dd58c0cbfe9bb2 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name> Reviewed-on: http://review.gluster.org/15150 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Prashanth Pai <ppai@redhat.com>
Diffstat (limited to 'api')
-rw-r--r--api/src/gfapi.aliases2
-rw-r--r--api/src/gfapi.map6
-rw-r--r--api/src/glfs-fops.c44
-rw-r--r--api/src/glfs.h2
4 files changed, 51 insertions, 3 deletions
diff --git a/api/src/gfapi.aliases b/api/src/gfapi.aliases
index 40b6ed2..8d43560 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 d42ae2b..3ee3558 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;
@@ -167,3 +166,8 @@ GFAPI_3.7.4 {
global:
glfs_h_lookupat;
} GFAPI_PRIVATE_3.7.0;
+
+GFAPI_3.7.15 {
+ global:
+ glfs_truncate;
+} GFAPI_3.7.4;
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c
index 4437ebf..66874de 100644
--- a/api/src/glfs-fops.c
+++ b/api/src/glfs-fops.c
@@ -1509,6 +1509,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 d3bf1b4..6671b4a 100644
--- a/api/src/glfs.h
+++ b/api/src/glfs.h
@@ -562,7 +562,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);