diff options
| author | Pavan Sondur <pavan@gluster.com> | 2010-10-01 05:45:12 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-01 05:05:53 -0700 |
| commit | fd2e7d007e5362f0738cd9a825349abcf5d27d8f (patch) | |
| tree | d86cd9b0162cd43cb6d1e573b24f6c49a5e353f4 /xlators/mount | |
| parent | 55c6e672503a2451186e17b9c1b7daf6e3ae5463 (diff) | |
Changes to replace flock with gf_flock across GlusterFS.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 865 (Add locks recovery support in GlusterFS)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865
Diffstat (limited to 'xlators/mount')
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.c | 10 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 5d5eb63c74f..b6497b15efd 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -2645,7 +2645,7 @@ static int gf_fuse_lk_enosys_log; static int fuse_getlk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct flock *lock) + int32_t op_ret, int32_t op_errno, struct gf_flock *lock) { fuse_state_t *state = NULL; @@ -2710,7 +2710,8 @@ fuse_getlk (xlator_t *this, fuse_in_header_t *finh, void *msg) fd = FH_TO_FD (fli->fh); GET_STATE (this, finh, state); state->fd = fd; - convert_fuse_file_lock (&fli->lk, &state->lk_lock); + convert_fuse_file_lock (&fli->lk, &state->lk_lock, + fli->owner); state->lk_owner = fli->owner; @@ -2722,7 +2723,7 @@ fuse_getlk (xlator_t *this, fuse_in_header_t *finh, void *msg) static int fuse_setlk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct flock *lock) + int32_t op_ret, int32_t op_errno, struct gf_flock *lock) { fuse_state_t *state = NULL; @@ -2790,7 +2791,8 @@ fuse_setlk (xlator_t *this, fuse_in_header_t *finh, void *msg) GET_STATE (this, finh, state); state->finh = finh; state->fd = fd; - convert_fuse_file_lock (&fli->lk, &state->lk_lock); + convert_fuse_file_lock (&fli->lk, &state->lk_lock, + fli->owner); state->lk_owner = fli->owner; diff --git a/xlators/mount/fuse/src/fuse-bridge.h b/xlators/mount/fuse/src/fuse-bridge.h index 53a2cc59814..d719832e398 100644 --- a/xlators/mount/fuse/src/fuse-bridge.h +++ b/xlators/mount/fuse/src/fuse-bridge.h @@ -265,7 +265,7 @@ typedef struct { dev_t rdev; mode_t mode; struct iatt attr; - struct flock lk_lock; + struct gf_flock lk_lock; struct iovec vector; uuid_t gfid; |