summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnand Avati <avati@redhat.com>2014-05-16 21:31:02 -0700
committerAnand Avati <avati@redhat.com>2014-05-17 11:53:53 -0700
commit98f5f436dd9106819dea8bc6c9a42e03ee1e31be (patch)
tree653676af2f22db83dc3f03fff7947ee3a1aae7de
parent618d465295df02ae6d53be1327947a210bb8b47d (diff)
meta: add .file_write method into meta_ops
Add .file_write method in meta_ops and make write support into virtual files (like loglevel, measure_latency) much simpler. Change-Id: I812f782f645605c56f81b158bb0f289b3c8f909a BUG: 1089216 Signed-off-by: Anand Avati <avati@redhat.com> Reviewed-on: http://review.gluster.org/7785 Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--xlators/meta/src/loglevel-file.c40
-rw-r--r--xlators/meta/src/measure-file.c41
-rw-r--r--xlators/meta/src/meta-defaults.c33
-rw-r--r--xlators/meta/src/meta.h1
4 files changed, 38 insertions, 77 deletions
diff --git a/xlators/meta/src/loglevel-file.c b/xlators/meta/src/loglevel-file.c
index 24ac68ddc69..6b00d123a2c 100644
--- a/xlators/meta/src/loglevel-file.c
+++ b/xlators/meta/src/loglevel-file.c
@@ -31,55 +31,21 @@ loglevel_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd)
static int
-loglevel_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
- struct iovec *iov, int count, off_t offset,
- uint32_t flags, struct iobref *iobref, dict_t *xdata)
+loglevel_file_write (xlator_t *this, fd_t *fd, struct iovec *iov, int count)
{
- struct iatt dummy = { };
long int level = -1;
level = strtol (iov[0].iov_base, NULL, 0);
if (level >= GF_LOG_NONE && level <= GF_LOG_TRACE)
gf_log_set_loglevel (level);
- META_STACK_UNWIND (writev, frame, iov_length (iov, count), 0,
- &dummy, &dummy, xdata);
- return 0;
-}
-
-
-int
-loglevel_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc,
- off_t offset, dict_t *xdata)
-{
- struct iatt iatt = { };
-
- meta_iatt_fill (&iatt, loc->inode, IA_IFREG);
-
- META_STACK_UNWIND (truncate, frame, 0, 0, &iatt, &iatt, xdata);
- return 0;
+ return iov_length (iov, count);
}
-int
-loglevel_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd,
- off_t offset, dict_t *xdata)
-{
- struct iatt iatt = { };
-
- meta_iatt_fill (&iatt, fd->inode, IA_IFREG);
-
- META_STACK_UNWIND (ftruncate, frame, 0, 0, &iatt, &iatt, xdata);
- return 0;
-}
-
static struct meta_ops loglevel_file_ops = {
.file_fill = loglevel_file_fill,
- .fops = {
- .truncate = loglevel_truncate,
- .ftruncate = loglevel_ftruncate,
- .writev = loglevel_writev
- }
+ .file_write = loglevel_file_write,
};
diff --git a/xlators/meta/src/measure-file.c b/xlators/meta/src/measure-file.c
index ccc78232dfe..e4498ab092e 100644
--- a/xlators/meta/src/measure-file.c
+++ b/xlators/meta/src/measure-file.c
@@ -31,54 +31,19 @@ measure_file_fill (xlator_t *this, inode_t *file, strfd_t *strfd)
static int
-measure_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
- struct iovec *iov, int count, off_t offset,
- uint32_t flags, struct iobref *iobref, dict_t *xdata)
+measure_file_write (xlator_t *this, fd_t *fd, struct iovec *iov, int count)
{
- struct iatt dummy = { };
long int num = -1;
num = strtol (iov[0].iov_base, NULL, 0);
this->ctx->measure_latency = !!num;
- META_STACK_UNWIND (writev, frame, iov_length (iov, count), 0,
- &dummy, &dummy, xdata);
- return 0;
-}
-
-
-int
-measure_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc,
- off_t offset, dict_t *xdata)
-{
- struct iatt iatt = { };
-
- meta_iatt_fill (&iatt, loc->inode, IA_IFREG);
-
- META_STACK_UNWIND (truncate, frame, 0, 0, &iatt, &iatt, xdata);
- return 0;
-}
-
-
-int
-measure_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd,
- off_t offset, dict_t *xdata)
-{
- struct iatt iatt = { };
-
- meta_iatt_fill (&iatt, fd->inode, IA_IFREG);
-
- META_STACK_UNWIND (ftruncate, frame, 0, 0, &iatt, &iatt, xdata);
- return 0;
+ return iov_length (iov, count);
}
static struct meta_ops measure_file_ops = {
.file_fill = measure_file_fill,
- .fops = {
- .truncate = measure_truncate,
- .ftruncate = measure_ftruncate,
- .writev = measure_writev
- }
+ .file_write = measure_file_write,
};
diff --git a/xlators/meta/src/meta-defaults.c b/xlators/meta/src/meta-defaults.c
index 905b38554a0..76244c7ee01 100644
--- a/xlators/meta/src/meta-defaults.c
+++ b/xlators/meta/src/meta-defaults.c
@@ -96,6 +96,23 @@ meta_default_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
struct iovec *vector, int32_t count, off_t off,
uint32_t flags, struct iobref *iobref, dict_t *xdata)
{
+ struct meta_ops *ops = NULL;
+ int ret = 0;
+ struct iatt dummy = { };
+
+ ops = meta_ops_get (fd->inode, this);
+ if (!ops)
+ goto err;
+
+ if (!ops->file_write)
+ goto err;
+
+ ret = ops->file_write (this, fd, vector, count);
+
+ META_STACK_UNWIND (writev, frame, (ret >= 0 ? : -1), (ret < 0 ? -ret : 0),
+ &dummy, &dummy, xdata);
+ return 0;
+err:
return default_writev_failure_cbk (frame, EPERM);
}
@@ -266,7 +283,13 @@ int
meta_default_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd,
off_t offset, dict_t *xdata)
{
- return default_ftruncate_failure_cbk (frame, EPERM);
+ struct iatt iatt = { };
+
+ meta_iatt_fill (&iatt, fd->inode, IA_IFREG);
+
+ META_STACK_UNWIND (ftruncate, frame, 0, 0, &iatt, &iatt, xdata);
+
+ return 0;
}
int
@@ -458,7 +481,13 @@ int
meta_default_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc,
off_t offset, dict_t *xdata)
{
- return default_truncate_failure_cbk (frame, EPERM);
+ struct iatt iatt = { };
+
+ meta_iatt_fill (&iatt, loc->inode, IA_IFREG);
+
+ META_STACK_UNWIND (truncate, frame, 0, 0, &iatt, &iatt, xdata);
+
+ return 0;
}
int
diff --git a/xlators/meta/src/meta.h b/xlators/meta/src/meta.h
index f6ec8cb9cb7..652ebd7321c 100644
--- a/xlators/meta/src/meta.h
+++ b/xlators/meta/src/meta.h
@@ -47,6 +47,7 @@ struct meta_ops {
int (*file_fill) (xlator_t *this, inode_t *file, strfd_t *strfd);
int (*iatt_fill) (xlator_t *this, inode_t *inode, struct iatt *iatt);
int (*link_fill) (xlator_t *this, inode_t *inode, strfd_t *strfd);
+ int (*file_write) (xlator_t *this, fd_t *fd, struct iovec *iov, int count);
struct xlator_fops fops;
struct xlator_cbks cbks;
};