From e0b057cf28abc534f1fc74f4ea921c78a52ab6fe Mon Sep 17 00:00:00 2001 From: Xavier Hernandez Date: Thu, 9 Jun 2016 17:29:26 +0200 Subject: cluster/ec: Fix invalid __fd_unref() call __fd_unref() doesn't do any cleanup, so it cannot be called to release fd references, specially if it's the last reference. The code has been changed to avoid a call to this function. In the previous version we always tried to keep the newest fd in the ec_lock_t structure. However this is not necessary. We'll always keep one reference to an open file on the same inode. It's irrelevant if the reference is new or old. The function __fd_unref() has also been removed from fd.h to avoid being used in the future since it's useless as it's defined now. Change-Id: Ia728777fc8e464758d5ea4d3bf020f0603919039 BUG: 1344396 Signed-off-by: Xavier Hernandez Reviewed-on: http://review.gluster.org/14683 NetBSD-regression: NetBSD Build System Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Ashish Pandey Reviewed-by: Jeff Darcy --- xlators/cluster/ec/src/ec-common.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'xlators/cluster/ec') diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c index 009fad2f896..c32a28d2ed1 100644 --- a/xlators/cluster/ec/src/ec-common.c +++ b/xlators/cluster/ec/src/ec-common.c @@ -1304,10 +1304,7 @@ ec_lock_update_fd(ec_lock_t *lock, ec_fop_data_t *fop) { /* If the fop has an fd available, attach it to the lock structure to be * able to do fxattrop calls instead of xattrop. */ - if (fop->use_fd) { - if (lock->fd != NULL) { - __fd_unref(lock->fd); - } + if (fop->use_fd && (lock->fd == NULL)) { lock->fd = __fd_ref(fop->fd); } } -- cgit