From d93b62a943f8181928f13175a273bcd9f1e0118f Mon Sep 17 00:00:00 2001 From: Shehjar Tikoo Date: Thu, 25 Jun 2009 14:31:28 +0000 Subject: booster: Remove gf_fd_unused_get2 Signed-off-by: Anand V. Avati --- libglusterfs/src/fd.c | 37 ------------------------------------- libglusterfs/src/fd.h | 7 ++++--- 2 files changed, 4 insertions(+), 40 deletions(-) (limited to 'libglusterfs/src') diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index b28fb047e..39385fd75 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -227,43 +227,6 @@ gf_fd_fdtable_destroy (fdtable_t *fdtable) } } -int32_t -gf_fd_unused_get2 (fdtable_t *fdtable, fd_t *fdptr, int32_t fd) -{ - int32_t ret = -1; - - if (fdtable == NULL || fdptr == NULL || fd < 0) - { - gf_log ("fd", GF_LOG_ERROR, "invalid argument"); - errno = EINVAL; - return -1; - } - - pthread_mutex_lock (&fdtable->lock); - { - while (fdtable->max_fds < fd) { - int error = 0; - error = gf_fd_fdtable_expand (fdtable, fdtable->max_fds + 1); - if (error) - { - gf_log ("fd.c", - GF_LOG_ERROR, - "Cannot expand fdtable:%s", strerror (error)); - goto err; - } - } - - fdtable->fdentries[fd].fd = fdptr; - fd_ref (fdptr); - ret = fd; - } -err: - pthread_mutex_unlock (&fdtable->lock); - - return ret; -} - - int32_t gf_fd_unused_get (fdtable_t *fdtable, fd_t *fdptr) { diff --git a/libglusterfs/src/fd.h b/libglusterfs/src/fd.h index efe02e887..298b1b347 100644 --- a/libglusterfs/src/fd.h +++ b/libglusterfs/src/fd.h @@ -38,6 +38,10 @@ struct _fd_ctx { uint64_t value; }; +/* If this structure changes, please have mercy on the booster maintainer + * and update the fd_t struct in booster/src/booster-fd.h. + * See the comment there to know why. + */ struct _fd { pid_t pid; int32_t flags; @@ -89,9 +93,6 @@ gf_fd_fdtable_alloc (void); int32_t gf_fd_unused_get (fdtable_t *fdtable, fd_t *fdptr); -int32_t -gf_fd_unused_get2 (fdtable_t *fdtable, fd_t *fdptr, int32_t fd); - fdentry_t * gf_fd_fdtable_get_all_fds (fdtable_t *fdtable, uint32_t *count); -- cgit