diff options
| author | Vikas Gorur <vikas@zresearch.com> | 2009-03-12 16:21:51 +0530 |
|---|---|---|
| committer | Anand V. Avati <avati@amp.gluster.com> | 2009-03-12 16:29:45 +0530 |
| commit | 7af8d8edbd8554235348e0f54348edf222c0b46e (patch) | |
| tree | 21333449bf86e3481e8bc4197d17f69472398ef9 /xlators/features | |
| parent | 31c817836c9c56eca1441b3b6f8b83db41c67f94 (diff) | |
Add extra 'volume' parameter to inodelk/entrylk calls
Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/locks/src/internal.c | 8 | ||||
| -rw-r--r-- | xlators/features/locks/src/posix.c | 8 | ||||
| -rw-r--r-- | xlators/features/path-convertor/src/path.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/xlators/features/locks/src/internal.c b/xlators/features/locks/src/internal.c index 985762fb..6bfb627a 100644 --- a/xlators/features/locks/src/internal.c +++ b/xlators/features/locks/src/internal.c @@ -62,7 +62,7 @@ delete_locks_of_transport (pl_inode_t *pinode, transport_t *trans) int pl_inodelk (call_frame_t *frame, xlator_t *this, - loc_t *loc, int32_t cmd, struct flock *flock) + const char *volume, loc_t *loc, int32_t cmd, struct flock *flock) { int32_t op_ret = -1; int32_t op_errno = 0; @@ -162,7 +162,7 @@ out: int pl_finodelk (call_frame_t *frame, xlator_t *this, - fd_t *fd, int32_t cmd, struct flock *flock) + const char *volume, fd_t *fd, int32_t cmd, struct flock *flock) { int32_t op_ret = -1; int32_t op_errno = 0; @@ -649,7 +649,7 @@ unlock: int pl_entrylk (call_frame_t *frame, xlator_t *this, - loc_t *loc, const char *basename, + const char *volume, loc_t *loc, const char *basename, entrylk_cmd cmd, entrylk_type type) { int32_t op_ret = -1; @@ -759,7 +759,7 @@ out: int pl_fentrylk (call_frame_t *frame, xlator_t *this, - fd_t *fd, const char *basename, + const char *volume, fd_t *fd, const char *basename, entrylk_cmd cmd, entrylk_type type) { int32_t op_ret = -1; diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index 46d2cb9a..095b5b28 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -785,20 +785,20 @@ fini (xlator_t *this) int pl_inodelk (call_frame_t *frame, xlator_t *this, - loc_t *loc, int32_t cmd, struct flock *flock); + const char *volume, loc_t *loc, int32_t cmd, struct flock *flock); int pl_finodelk (call_frame_t *frame, xlator_t *this, - fd_t *fd, int32_t cmd, struct flock *flock); + const char *volume, fd_t *fd, int32_t cmd, struct flock *flock); int pl_entrylk (call_frame_t *frame, xlator_t *this, - loc_t *loc, const char *basename, + const char *volume, loc_t *loc, const char *basename, entrylk_cmd cmd, entrylk_type type); int pl_fentrylk (call_frame_t *frame, xlator_t *this, - fd_t *fd, const char *basename, + const char *volume, fd_t *fd, const char *basename, entrylk_cmd cmd, entrylk_type type); struct xlator_fops fops = { diff --git a/xlators/features/path-convertor/src/path.c b/xlators/features/path-convertor/src/path.c index 293f3417..8badef38 100644 --- a/xlators/features/path-convertor/src/path.c +++ b/xlators/features/path-convertor/src/path.c @@ -1021,7 +1021,7 @@ path_checksum (call_frame_t *frame, int32_t path_entrylk (call_frame_t *frame, xlator_t *this, - loc_t *loc, const char *basename, + const char *volume, loc_t *loc, const char *basename, entrylk_cmd cmd, entrylk_type type) { char *loc_path = (char *)loc->path; @@ -1036,7 +1036,7 @@ path_entrylk (call_frame_t *frame, xlator_t *this, STACK_WIND (frame, path_common_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->entrylk, - loc, basename, cmd, type); + volume, loc, basename, cmd, type); loc->path = loc_path; if (tmp_path != loc_path) @@ -1047,7 +1047,7 @@ path_entrylk (call_frame_t *frame, xlator_t *this, int32_t path_inodelk (call_frame_t *frame, xlator_t *this, - loc_t *loc, int32_t cmd, struct flock *lock) + const char *volume, loc_t *loc, int32_t cmd, struct flock *lock) { char *loc_path = (char *)loc->path; char *tmp_path = NULL; @@ -1062,7 +1062,7 @@ path_inodelk (call_frame_t *frame, xlator_t *this, path_common_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->inodelk, - loc, cmd, lock); + volume, loc, cmd, lock); loc->path = loc_path; if (tmp_path != loc_path) |