diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
| commit | a827c5eab32a43ade5551259ea56a6a1af7e861b (patch) | |
| tree | e6707df68f72baa8645210ba931272285116ad85 /xlators/features/locks/src/entrylk.c | |
| parent | 46d333783a968ab39e0beade9c7a1eec8035f8b1 (diff) | |
| parent | 99bfc2a2a1689da1e173cb2f8ef54d2b09ef3a5d (diff) | |
Merge branch 'upstream'
Conflicts:
glusterfs.spec.in
xlators/mgmt/glusterd/src/Makefile.am
xlators/mgmt/glusterd/src/glusterd-utils.c
xlators/mgmt/glusterd/src/glusterd.h
Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d
Diffstat (limited to 'xlators/features/locks/src/entrylk.c')
| -rw-r--r-- | xlators/features/locks/src/entrylk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index ea6995627..dc86512be 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -62,6 +62,7 @@ new_entrylk_lock (pl_inode_t *pinode, const char *basename, entrylk_type type, newlock->volume = domain; newlock->owner = frame->root->lk_owner; newlock->frame = frame; + newlock->this = frame->this; if (conn_id) { newlock->connection_id = gf_strdup (conn_id); |