diff options
| author | Xavier Hernandez <xhernandez@datalab.es> | 2016-06-09 17:29:26 +0200 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-06-13 05:14:38 -0700 |
| commit | e0b057cf28abc534f1fc74f4ea921c78a52ab6fe (patch) | |
| tree | 45cbdeef7d2f25b9ca2d55ab9cb00536e8b141e1 | |
| parent | 40a7537556a7eb0a7c90ec6e7e2fd4014beae092 (diff) | |
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 <xhernandez@datalab.es>
Reviewed-on: http://review.gluster.org/14683
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Ashish Pandey <aspandey@redhat.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
| -rw-r--r-- | libglusterfs/src/fd.h | 3 | ||||
| -rw-r--r-- | xlators/cluster/ec/src/ec-common.c | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libglusterfs/src/fd.h b/libglusterfs/src/fd.h index 322cac7dd1f..31f494a7e8f 100644 --- a/libglusterfs/src/fd.h +++ b/libglusterfs/src/fd.h @@ -116,9 +116,6 @@ fd_t * fd_ref (fd_t *fd); -fd_t * -__fd_unref (fd_t *fd); - void fd_unref (fd_t *fd); 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); } } |