From f6c5024eb3f37b2c4e5a3bea5136987affb19aa7 Mon Sep 17 00:00:00 2001
From: Anoop C S <anoopcs@redhat.com>
Date: Fri, 27 Nov 2015 10:50:14 +0530
Subject: gfapi: Remove TODO for merging of locks

pub_glfs_posix_lock() currently merge/split locks via
fd_lk_insert_and_merge(). So removing the same from
TODO list.

Change-Id: I956fbb3a99ada9616392f934034a94be418195c4
BUG: 1202274
Signed-off-by: Anoop C S <anoopcs@redhat.com>
Reviewed-on: http://review.gluster.org/12770
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
---
 api/src/glfs.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'api/src/glfs.c')

diff --git a/api/src/glfs.c b/api/src/glfs.c
index 18f5c8f913f..d995b7f130c 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -11,7 +11,6 @@
 
 /*
   TODO:
-  - merge locks in glfs_posix_lock for lock self-healing
   - set proper pid/lk_owner to call frames (currently buried in syncop)
   - fix logging.c/h to store logfp and loglevel in glusterfs_ctx_t and
     reach it via THIS.
-- 
cgit