|
 |
e7a346 |
From 87fd48e99d6b3556aba0c4f1485b06334b8cc1cf Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Raghavendra G <rgowdapp@redhat.com>
|
|
|
e7a346 |
Date: Wed, 9 May 2018 14:57:35 +0530
|
|
|
e7a346 |
Subject: [PATCH 261/271] libglusterfs/syncop: Add syncop_entrylk
|
|
|
e7a346 |
|
|
|
e7a346 |
>Change-Id: Idd86b9f0fa144c2316ab6276e2def28b696ae18a
|
|
|
e7a346 |
>BUG: 1543279
|
|
|
e7a346 |
>Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
|
|
|
e7a346 |
|
|
|
e7a346 |
upstream patch: https://review.gluster.org/#/c/19556/
|
|
|
e7a346 |
BUG: 1488120
|
|
|
e7a346 |
Change-Id: I02e546bcb012545dcdaa70ea26046db05b5032f4
|
|
|
e7a346 |
Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/138169
|
|
|
e7a346 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
e7a346 |
Reviewed-by: Nithya Balachandran <nbalacha@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
libglusterfs/src/syncop.c | 37 +++++++++++++++++++++++++++++++++++++
|
|
|
e7a346 |
libglusterfs/src/syncop.h | 5 +++++
|
|
|
e7a346 |
2 files changed, 42 insertions(+)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
|
|
|
e7a346 |
index b36c88d..ac40a1d 100644
|
|
|
e7a346 |
--- a/libglusterfs/src/syncop.c
|
|
|
e7a346 |
+++ b/libglusterfs/src/syncop.c
|
|
|
e7a346 |
@@ -3019,6 +3019,43 @@ syncop_inodelk (xlator_t *subvol, const char *volume, loc_t *loc, int32_t cmd,
|
|
|
e7a346 |
}
|
|
|
e7a346 |
|
|
|
e7a346 |
int32_t
|
|
|
e7a346 |
+syncop_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
|
|
|
e7a346 |
+ int32_t op_ret, int32_t op_errno, dict_t *xdata)
|
|
|
e7a346 |
+{
|
|
|
e7a346 |
+ struct syncargs *args = NULL;
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+ args = cookie;
|
|
|
e7a346 |
+ args->op_ret = op_ret;
|
|
|
e7a346 |
+ args->op_errno = op_errno;
|
|
|
e7a346 |
+ if (xdata)
|
|
|
e7a346 |
+ args->xdata = dict_ref (xdata);
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+ __wake (args);
|
|
|
e7a346 |
+ return 0;
|
|
|
e7a346 |
+}
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+int
|
|
|
e7a346 |
+syncop_entrylk (xlator_t *subvol, const char *volume, loc_t *loc,
|
|
|
e7a346 |
+ const char *basename, entrylk_cmd cmd, entrylk_type type,
|
|
|
e7a346 |
+ dict_t *xdata_in, dict_t **xdata_out)
|
|
|
e7a346 |
+{
|
|
|
e7a346 |
+ struct syncargs args = {0, };
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+ SYNCOP (subvol, (&args), syncop_entrylk_cbk, subvol->fops->entrylk,
|
|
|
e7a346 |
+ volume, loc, basename, cmd, type, xdata_in);
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+ if (xdata_out)
|
|
|
e7a346 |
+ *xdata_out = args.xdata;
|
|
|
e7a346 |
+ else if (args.xdata)
|
|
|
e7a346 |
+ dict_unref (args.xdata);
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+ if (args.op_ret < 0)
|
|
|
e7a346 |
+ return -args.op_errno;
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+ return args.op_ret;
|
|
|
e7a346 |
+}
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+int32_t
|
|
|
e7a346 |
syncop_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
|
|
|
e7a346 |
int32_t op_ret, int32_t op_errno, dict_t *dict,
|
|
|
e7a346 |
dict_t *xdata)
|
|
|
e7a346 |
diff --git a/libglusterfs/src/syncop.h b/libglusterfs/src/syncop.h
|
|
|
e7a346 |
index a9cdee1..5b5ad4e 100644
|
|
|
e7a346 |
--- a/libglusterfs/src/syncop.h
|
|
|
e7a346 |
+++ b/libglusterfs/src/syncop.h
|
|
|
e7a346 |
@@ -562,4 +562,9 @@ syncop_setactivelk (xlator_t *subvol, loc_t *loc,
|
|
|
e7a346 |
lock_migration_info_t *locklist, dict_t *xdata_in,
|
|
|
e7a346 |
dict_t **xdata_out);
|
|
|
e7a346 |
|
|
|
e7a346 |
+int
|
|
|
e7a346 |
+syncop_entrylk (xlator_t *subvol, const char *volume, loc_t *loc,
|
|
|
e7a346 |
+ const char *basename, entrylk_cmd cmd, entrylk_type type,
|
|
|
e7a346 |
+ dict_t *xdata_in, dict_t **xdata_out);
|
|
|
e7a346 |
+
|
|
|
e7a346 |
#endif /* _SYNCOP_H */
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|