ceph: fix duplicate increment of opened_inodes metric

opened_inodes is incremented twice when the same inode is opened twice
with O_RDONLY and O_WRONLY respectively.

To reproduce, run this python script, then check the metrics:

import os
for _ in range(10000):
    fd_r = os.open('a', os.O_RDONLY)
    fd_w = os.open('a', os.O_WRONLY)
    os.close(fd_r)
    os.close(fd_w)

Fixes: 1dd8d4708136 ("ceph: metrics for opened files, pinned caps and opened inodes")
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Hu Weiwen <sehuww@mail.scut.edu.cn>
Signed-off-by: Jeff Layton <jlayton@kernel.org>

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 52774615a8c93cfe79fc63109d57eea5ddd556ef..7d2fa952cb365d164499b506abbd003f268e56fe 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -4363,7 +4363,7 @@ void ceph_get_fmode(struct ceph_inode_info *ci, int fmode, int count)
 {
        struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(ci->vfs_inode.i_sb);
        int bits = (fmode << 1) | 1;
-       bool is_opened = false;
+       bool already_opened = false;
        int i;
 
        if (count == 1)
@@ -4371,19 +4371,19 @@ void ceph_get_fmode(struct ceph_inode_info *ci, int fmode, int count)
 
        spin_lock(&ci->i_ceph_lock);
        for (i = 0; i < CEPH_FILE_MODE_BITS; i++) {
-               if (bits & (1 << i))
-                       ci->i_nr_by_mode[i] += count;
-
                /*
-                * If any of the mode ref is larger than 1,
+                * If any of the mode ref is larger than 0,
                 * that means it has been already opened by
                 * others. Just skip checking the PIN ref.
                 */
-               if (i && ci->i_nr_by_mode[i] > 1)
-                       is_opened = true;
+               if (i && ci->i_nr_by_mode[i])
+                       already_opened = true;
+
+               if (bits & (1 << i))
+                       ci->i_nr_by_mode[i] += count;
        }
 
-       if (!is_opened)
+       if (!already_opened)
                percpu_counter_inc(&mdsc->metric.opened_inodes);
        spin_unlock(&ci->i_ceph_lock);
 }