From d19e38aa7c043ae101445706b5c75f61f57f51a1 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Fri, 6 Jan 2012 15:07:48 +0530 Subject: features/locks: update user_flock structure before inserting Change-Id: Idfa00e4f3263d50b327f5a2c6f13ec68ffc8fbee BUG: 805994 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.com/3048 Tested-by: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: Anand Avati --- xlators/features/locks/src/common.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'xlators/features/locks') diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c index af03cdf2a7a..f59d0882c1a 100644 --- a/xlators/features/locks/src/common.c +++ b/xlators/features/locks/src/common.c @@ -803,6 +803,7 @@ __insert_and_merge (pl_inode_t *pl_inode, posix_lock_t *lock) __destroy_lock (lock); INIT_LIST_HEAD (&sum->list); + posix_lock_to_flock (sum, &sum->user_flock); __insert_and_merge (pl_inode, sum); return; @@ -830,6 +831,8 @@ __insert_and_merge (pl_inode_t *pl_inode, posix_lock_t *lock) continue; INIT_LIST_HEAD (&v.locks[i]->list); + posix_lock_to_flock (v.locks[i], + &v.locks[i]->user_flock); __insert_and_merge (pl_inode, v.locks[i]); } -- cgit