diff options
| author | Vijay Bellur <vijay@gluster.com> | 2011-09-22 08:30:48 -0700 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-09-22 08:42:01 -0700 |
| commit | 9564e09e5315846a38ed18e05630ef73be5b2adb (patch) | |
| tree | ad633f8f65c61ec60a5238debe8918511e7bee2b /xlators/cluster/afr/src/afr.h | |
| parent | 7edb580b1a702096ee11ba28b66fad16fc83dbd6 (diff) | |
Revert "cluster/afr: eager locking of FD writes"v3.2.4qa3
This reverts commit 81456ec2dfb312ae60c5c4e6f960a3cbf8aaaa4c.
Change-Id: Id03335117f5137f5d09781850bf4fba6eca0f73d
Reviewed-on: http://review.gluster.com/492
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr.h')
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 6a9907e97..6f40ded12 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -92,7 +92,6 @@ typedef struct _afr_private { pthread_mutex_t mutex; struct list_head saved_fds; /* list of fds on which locks have succeeded */ gf_boolean_t optimistic_change_log; - gf_boolean_t eager_lock; char vol_uuid[UUID_SIZE + 1]; int32_t *last_event; @@ -598,8 +597,6 @@ typedef struct _afr_local { struct { off_t start, len; - int *eager_lock; - char *basename; char *new_basename; @@ -639,9 +636,6 @@ typedef struct { unsigned int *opened_on; /* which subvolumes the fd is open on */ unsigned int *pre_op_piggyback; - unsigned int *lock_piggyback; - unsigned int *lock_acquired; - int flags; int32_t wbflags; uint64_t up_count; /* number of CHILD_UPs this fd has seen */ @@ -945,10 +939,6 @@ afr_transaction_local_init (afr_local_t *local, afr_private_t *priv) priv->child_count, gf_afr_mt_int32_t); - local->transaction.eager_lock = GF_CALLOC (sizeof (*local->transaction.eager_lock), - priv->child_count, - gf_afr_mt_int32_t); - local->internal_lock.transaction_lk_type = AFR_TRANSACTION_LK; return 0; @@ -957,5 +947,5 @@ afr_transaction_local_init (afr_local_t *local, afr_private_t *priv) int32_t afr_marker_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, const char *name,afr_local_t *local, afr_private_t *priv ); -afr_fd_ctx_t * afr_fd_ctx_get (fd_t *fd, xlator_t *this); + #endif /* __AFR_H__ */ |