ocfs2: always read both high and low parts of dinode link count
authorAlexey Asemov <alex@alex-at.net>
Sun, 27 Nov 2022 06:46:38 +0000 (09:46 +0300)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 12 Dec 2022 03:30:19 +0000 (19:30 -0800)
When filesystem is using indexed-dirs feature, maximum link count values
can spill over to i_links_count_hi, up to OCFS2_DX_LINK_MAX links.
ocfs2_read_links_count() checks for OCFS2_INDEXED_DIR_FL flag in dinode,
but this flag is only valid for directories so for files the check causes
high part of the link count not being read back from file dinodes
resulting in wrong link count value when file has >65535 links.

As ocfs2_set_links_count() always writes both high and low parts of link
count, the flag check on reading may be removed.

Link: https://lkml.kernel.org/r/cbfca02b-b39f-89de-e1a8-904a6c60407e@alex-at.net
Signed-off-by: Alexey Asemov <alex@alex-at.net>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/ocfs2/ocfs2.h

index 740b64238312733c81ec4b89cfe1da106c37bc65..a503c553bab21b6d7aec915de5e961051fe4027f 100644 (file)
@@ -560,8 +560,7 @@ static inline unsigned int ocfs2_read_links_count(struct ocfs2_dinode *di)
        u32 nlink = le16_to_cpu(di->i_links_count);
        u32 hi = le16_to_cpu(di->i_links_count_hi);
 
-       if (di->i_dyn_features & cpu_to_le16(OCFS2_INDEXED_DIR_FL))
-               nlink |= (hi << OCFS2_LINKS_HI_SHIFT);
+       nlink |= (hi << OCFS2_LINKS_HI_SHIFT);
 
        return nlink;
 }