staging: erofs: sunset erofs_workstn_{lock,unlock}

It was used for Linux backward compatibility, and
no use for upstream kernel.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Link: https://lore.kernel.org/r/20190731155752.210602-6-gaoxiang25@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h
index 501429ec0f9104223ac52d065a7fce8f4394c4ec..ed487ee56f74eae782f9d0debf438b7fce78f889 100644 (file)
--- a/drivers/staging/erofs/internal.h
+++ b/drivers/staging/erofs/internal.h
@@ -179,9 +179,6 @@ static inline void *erofs_kmalloc(struct erofs_sb_info *sbi,
 #define test_opt(sbi, option)  ((sbi)->mount_opt & EROFS_MOUNT_##option)
 
 #ifdef CONFIG_EROFS_FS_ZIP
-#define erofs_workstn_lock(sbi)         xa_lock(&(sbi)->workstn_tree)
-#define erofs_workstn_unlock(sbi)       xa_unlock(&(sbi)->workstn_tree)
-
 /* basic unit of the workstation of a super_block */
 struct erofs_workgroup {
        /* the workgroup index in the workstation */

diff --git a/drivers/staging/erofs/utils.c b/drivers/staging/erofs/utils.c
index a68dbe375fa0013361117c585ec1cda7bf9687d8..024806003297c246a5b71409516b9eb1c7a3b84d 100644 (file)
--- a/drivers/staging/erofs/utils.c
+++ b/drivers/staging/erofs/utils.c
@@ -102,14 +102,14 @@ int erofs_register_workgroup(struct super_block *sb,
                return err;
 
        sbi = EROFS_SB(sb);
-       erofs_workstn_lock(sbi);
+       xa_lock(&sbi->workstn_tree);
 
        grp = xa_tag_pointer(grp, tag);
 
        /*
         * Bump up reference count before making this workgroup
         * visible to other users in order to avoid potential UAF
-        * without serialized by erofs_workstn_lock.
+        * without serialized by workstn_lock.
         */
        __erofs_workgroup_get(grp);
 
@@ -122,7 +122,7 @@ int erofs_register_workgroup(struct super_block *sb,
                 */
                __erofs_workgroup_put(grp);
 
-       erofs_workstn_unlock(sbi);
+       xa_unlock(&sbi->workstn_tree);
        radix_tree_preload_end();
        return err;
 }
@@ -225,7 +225,7 @@ unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi,
 
        int i, found;
 repeat:
-       erofs_workstn_lock(sbi);
+       xa_lock(&sbi->workstn_tree);
 
        found = radix_tree_gang_lookup(&sbi->workstn_tree,
                                       batch, first_index, PAGEVEC_SIZE);
@@ -243,7 +243,7 @@ repeat:
                if (unlikely(!--nr_shrink))
                        break;
        }
-       erofs_workstn_unlock(sbi);
+       xa_unlock(&sbi->workstn_tree);
 
        if (i && nr_shrink)
                goto repeat;