diff options
| author | Vijay Bellur <vijay@gluster.com> | 2012-03-03 00:01:23 -0800 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-03-03 05:01:40 -0800 |
| commit | 7fec9b41d8e1befa8d58a76d98207debddd60b65 (patch) | |
| tree | d0f503c0dbffc53dbf22c91d7e1c70d0c4405db0 /xlators/cluster/afr/src/afr.h | |
| parent | aaac9cf176b407f89a1e8015140916b3f9d3cddb (diff) | |
Revert "afr: [Un]Set the 'right' lkowner for [f]{inode|entry}_lk and the 'enclosed' fop."
This reverts commit 2e80fdbeb6abbb23ff6789c2b98c82704883af0a.
Change-Id: I417fd43e4195d63e5b8b83dd3beb712887130e1e
Reviewed-on: http://review.gluster.com/2860
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 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index fc77b806e..a1c1bb398 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -336,9 +336,6 @@ afr_index_for_transaction_type (afr_transaction_type type) typedef struct { loc_t *lk_loc; struct gf_flock lk_flock; - gf_lkowner_t fop_lkowner; /* 'copy' of fop's lk_owner to protect - against afr internal locks 'irreversibly' - overloading lk_owner.*/ const char *lk_basename; const char *lower_basename; @@ -773,12 +770,7 @@ afr_mark_locked_nodes (xlator_t *this, fd_t *fd, unsigned char *locked_nodes); void -afr_set_lk_owner (call_frame_t *frame, xlator_t *this, - afr_internal_lock_t *int_lock); - -void -afr_unset_lk_owner (call_frame_t *frame, xlator_t *this, - afr_internal_lock_t *int_lock); +afr_set_lk_owner (call_frame_t *frame, xlator_t *this); int afr_set_lock_number (call_frame_t *frame, xlator_t *this); |