ocfs2: add duplicated ino number check

Add duplicated ino number check, to avoid adding a file into the file
check list when this file is being checked.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Gang He <[email protected]>
Cc: Mark Fasheh <[email protected]>
Cc: Joel Becker <[email protected]>
Cc: Junxiao Bi <[email protected]>
Cc: Joseph Qi <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c
index a94c5310a59a6dc6409a954c6c9d4ea29ab40760..f65f2b2f594d4f0a705faf58ab068054124d79af 100644 (file)
--- a/fs/ocfs2/filecheck.c
+++ b/fs/ocfs2/filecheck.c
@@ -353,6 +353,22 @@ exit:
        return total;
 }
 
+static inline int
+ocfs2_filecheck_is_dup_entry(struct ocfs2_filecheck_sysfs_entry *ent,
+                               unsigned long ino)
+{
+       struct ocfs2_filecheck_entry *p;
+
+       list_for_each_entry(p, &ent->fs_fcheck->fc_head, fe_list) {
+               if (!p->fe_done) {
+                       if (p->fe_ino == ino)
+                               return 1;
+               }
+       }
+
+       return 0;
+}
+
 static inline int
 ocfs2_filecheck_erase_entry(struct ocfs2_filecheck_sysfs_entry *ent)
 {
@@ -467,7 +483,10 @@ static ssize_t ocfs2_filecheck_attr_store(struct kobject *kobj,
        }
 
        spin_lock(&ent->fs_fcheck->fc_lock);
-       if ((ent->fs_fcheck->fc_size >= ent->fs_fcheck->fc_max) &&
+       if (ocfs2_filecheck_is_dup_entry(ent, args.fa_ino)) {
+               ret = -EEXIST;
+               kfree(entry);
+       } else if ((ent->fs_fcheck->fc_size >= ent->fs_fcheck->fc_max) &&
                (ent->fs_fcheck->fc_done == 0)) {
                mlog(ML_NOTICE,
                "Cannot do more file check "