From f5987d38f216a3142dfe45f03bf66ff4827d9b55 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Mon, 11 Mar 2019 14:04:39 +0530 Subject: storage/posix: Remove nr_files usage nr_files is supposed to represent the number of files opened in posix. Present logic doesn't seem to handle anon-fds because of which the counts would always be wrong. I don't remember anyone using this value in debugging any problem probably because we always have 'ls -l /proc//fd' which not only prints the fds that are active but also prints their paths. It also handles directories and anon-fds which actually opened the file. So removing this code instead of fixing the buggy logic to have the nr_files. fixes bz#1688106 Change-Id: Ibf8713fdfdc1ef094e08e6818152637206a54040 Signed-off-by: Pranith Kumar K --- xlators/storage/posix/src/posix-common.c | 2 -- xlators/storage/posix/src/posix-entry-ops.c | 2 -- xlators/storage/posix/src/posix-inode-fd-ops.c | 2 -- xlators/storage/posix/src/posix.h | 1 - 4 files changed, 7 deletions(-) (limited to 'xlators/storage/posix/src') diff --git a/xlators/storage/posix/src/posix-common.c b/xlators/storage/posix/src/posix-common.c index f0d8e3fe0c2..06ff6e631bb 100644 --- a/xlators/storage/posix/src/posix-common.c +++ b/xlators/storage/posix/src/posix-common.c @@ -128,7 +128,6 @@ posix_priv(xlator_t *this) gf_proc_dump_write("max_read", "%" PRId64, GF_ATOMIC_GET(priv->read_value)); gf_proc_dump_write("max_write", "%" PRId64, GF_ATOMIC_GET(priv->write_value)); - gf_proc_dump_write("nr_files", "%" PRId64, GF_ATOMIC_GET(priv->nr_files)); return 0; } @@ -776,7 +775,6 @@ posix_init(xlator_t *this) } LOCK_INIT(&_private->lock); - GF_ATOMIC_INIT(_private->nr_files, 0); GF_ATOMIC_INIT(_private->read_value, 0); GF_ATOMIC_INIT(_private->write_value, 0); diff --git a/xlators/storage/posix/src/posix-entry-ops.c b/xlators/storage/posix/src/posix-entry-ops.c index fbd83c4aed1..859159a87b4 100644 --- a/xlators/storage/posix/src/posix-entry-ops.c +++ b/xlators/storage/posix/src/posix-entry-ops.c @@ -2210,8 +2210,6 @@ fill_stat: gf_msg(this->name, GF_LOG_WARNING, 0, P_MSG_FD_PATH_SETTING_FAILED, "failed to set the fd context path=%s fd=%p", real_path, fd); - GF_ATOMIC_INC(priv->nr_files); - op_ret = 0; out: diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c index 0ee6803880d..93497da812b 100644 --- a/xlators/storage/posix/src/posix-inode-fd-ops.c +++ b/xlators/storage/posix/src/posix-inode-fd-ops.c @@ -1490,7 +1490,6 @@ posix_open(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, "failed to set the fd context gfid-handle=%s path=%s fd=%p", real_path, loc->path, fd); - GF_ATOMIC_INC(priv->nr_files); op_ret = 0; out: @@ -2369,7 +2368,6 @@ posix_release(xlator_t *this, fd_t *fd) if (!priv) goto out; - GF_ATOMIC_DEC(priv->nr_files); out: return 0; } diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h index d5ba08ca593..c40e6fd8136 100644 --- a/xlators/storage/posix/src/posix.h +++ b/xlators/storage/posix/src/posix.h @@ -154,7 +154,6 @@ struct posix_private { gf_atomic_t read_value; /* Total read, from init */ gf_atomic_t write_value; /* Total write, from init */ - gf_atomic_t nr_files; /* In some cases, two exported volumes may reside on the same partition on the server. Sending statvfs info for both -- cgit