summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xlators/features/locks/src/common.c2
-rw-r--r--xlators/features/locks/src/common.h2
-rw-r--r--xlators/features/locks/src/entrylk.c8
-rw-r--r--xlators/features/locks/src/inodelk.c6
-rw-r--r--xlators/features/locks/src/locks.h7
-rw-r--r--xlators/features/locks/src/posix.c6
6 files changed, 15 insertions, 16 deletions
diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
index 9568c2a5e9c..8ab9feaaf05 100644
--- a/xlators/features/locks/src/common.c
+++ b/xlators/features/locks/src/common.c
@@ -451,7 +451,7 @@ out:
/* Create a new posix_lock_t */
posix_lock_t *
-new_posix_lock (struct flock *flock, transport_t *transport, pid_t client_pid,
+new_posix_lock (struct flock *flock, void *transport, pid_t client_pid,
uint64_t owner, fd_t *fd)
{
posix_lock_t *lock = NULL;
diff --git a/xlators/features/locks/src/common.h b/xlators/features/locks/src/common.h
index 133a4f7227a..d707294475f 100644
--- a/xlators/features/locks/src/common.h
+++ b/xlators/features/locks/src/common.h
@@ -21,7 +21,7 @@
#define __COMMON_H__
posix_lock_t *
-new_posix_lock (struct flock *flock, transport_t *transport, pid_t client_pid,
+new_posix_lock (struct flock *flock, void *transport, pid_t client_pid,
uint64_t owner, fd_t *fd);
pl_inode_t *
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c
index e4b9bb5687e..f7961be95ea 100644
--- a/xlators/features/locks/src/entrylk.c
+++ b/xlators/features/locks/src/entrylk.c
@@ -35,7 +35,7 @@
static pl_entry_lock_t *
new_entrylk_lock (pl_inode_t *pinode, const char *basename, entrylk_type type,
- transport_t *trans, pid_t client_pid, uint64_t owner, const char *volume)
+ void *trans, pid_t client_pid, uint64_t owner, const char *volume)
{
pl_entry_lock_t *newlock = NULL;
@@ -318,7 +318,7 @@ __lock_name (pl_inode_t *pinode, const char *basename, entrylk_type type,
{
pl_entry_lock_t *lock = NULL;
pl_entry_lock_t *conf = NULL;
- transport_t *trans = NULL;
+ void *trans = NULL;
pid_t client_pid = 0;
uint64_t owner = 0;
@@ -508,7 +508,7 @@ grant_blocked_entry_locks (xlator_t *this, pl_inode_t *pl_inode,
static int
release_entry_locks_for_transport (xlator_t *this, pl_inode_t *pinode,
- pl_dom_list_t *dom, transport_t *trans)
+ pl_dom_list_t *dom, void *trans)
{
pl_entry_lock_t *lock = NULL;
pl_entry_lock_t *tmp = NULL;
@@ -589,7 +589,7 @@ pl_common_entrylk (call_frame_t *frame, xlator_t *this,
int32_t op_ret = -1;
int32_t op_errno = 0;
- transport_t * transport = NULL;
+ void * transport = NULL;
pid_t pid = -1;
uint64_t owner = -1;
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index 64028d079c3..f8afe6ab56e 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -370,7 +370,7 @@ grant_blocked_inode_locks (xlator_t *this, pl_inode_t *pl_inode, pl_dom_list_t *
/* Release all inodelks from this transport */
static int
release_inode_locks_of_transport (xlator_t *this, pl_dom_list_t *dom,
- inode_t *inode, transport_t *trans)
+ inode_t *inode, void *trans)
{
pl_inode_lock_t *tmp = NULL;
pl_inode_lock_t *l = NULL;
@@ -509,7 +509,7 @@ out:
/* Create a new inode_lock_t */
pl_inode_lock_t *
-new_inode_lock (struct flock *flock, transport_t *transport, pid_t client_pid,
+new_inode_lock (struct flock *flock, void *transport, pid_t client_pid,
uint64_t owner, const char *volume)
{
@@ -550,7 +550,7 @@ pl_common_inodelk (call_frame_t *frame, xlator_t *this,
int32_t op_errno = 0;
int ret = -1;
int can_block = 0;
- transport_t * transport = NULL;
+ void * transport = NULL;
pid_t client_pid = -1;
uint64_t owner = -1;
pl_inode_t * pinode = NULL;
diff --git a/xlators/features/locks/src/locks.h b/xlators/features/locks/src/locks.h
index 01764484a0c..60474615e5f 100644
--- a/xlators/features/locks/src/locks.h
+++ b/xlators/features/locks/src/locks.h
@@ -26,7 +26,6 @@
#endif
#include "compat-errno.h"
-#include "transport.h"
#include "stack.h"
#include "call-stub.h"
#include "locks-mem-types.h"
@@ -50,7 +49,7 @@ struct __posix_lock {
/* These two together serve to uniquely identify each process
across nodes */
- transport_t *transport; /* to identify client node */
+ void *transport; /* to identify client node */
pid_t client_pid; /* pid of client process */
uint64_t owner; /* lock owner from fuse */
};
@@ -75,7 +74,7 @@ struct __pl_inode_lock {
/* These two together serve to uniquely identify each process
across nodes */
- transport_t *transport; /* to identify client node */
+ void *transport; /* to identify client node */
pid_t client_pid; /* pid of client process */
uint64_t owner;
};
@@ -110,7 +109,7 @@ struct __entry_lock {
const char *basename;
entrylk_type type;
- transport_t *trans;
+ void *trans;
pid_t client_pid; /* pid of client process */
uint64_t owner;
};
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index 83b3eb34039..6e5ea94f87b 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -76,7 +76,7 @@ pl_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
static int
truncate_allowed (pl_inode_t *pl_inode,
- transport_t *transport, pid_t client_pid,
+ void *transport, pid_t client_pid,
uint64_t owner, off_t offset)
{
posix_lock_t *l = NULL;
@@ -277,7 +277,7 @@ delete_locks_of_fd (xlator_t *this, pl_inode_t *pl_inode, fd_t *fd)
static void
__delete_locks_of_owner (pl_inode_t *pl_inode,
- transport_t *transport, uint64_t owner)
+ void *transport, uint64_t owner)
{
posix_lock_t *tmp = NULL;
posix_lock_t *l = NULL;
@@ -748,7 +748,7 @@ int
pl_lk (call_frame_t *frame, xlator_t *this,
fd_t *fd, int32_t cmd, struct flock *flock)
{
- transport_t *transport = NULL;
+ void *transport = NULL;
pid_t client_pid = 0;
uint64_t owner = 0;
posix_locks_private_t *priv = NULL;
generated by cgit (git 2.34.1) at 2025-11-04 07:55:42 +0000