Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Chengguang Xu <cgxu519@mykernel.net>
To:     tytso@mit.edu, adilger.kernel@dilger.ca
Cc:     linux-ext4@vger.kernel.org, Chengguang Xu <cgxu519@mykernel.net>
Message-ID: <20191006103028.31299-1-cgxu519@mykernel.net>
Subject: [PATCH] ext4: code cleanup for get_next_id
Date:   Sun,  6 Oct 2019 18:30:28 +0800
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

Now the checks in ext4_get_next_id() and dquot_get_next_id()
are almost the same, so just call dquot_get_next_id() instead
of ext4_get_next_id().

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
---
 fs/ext4/super.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index dd654e53ba3d..d1bdffcbfcee 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1374,7 +1374,6 @@ static ssize_t ext4_quota_write(struct super_block *s=
b, int type,
 static int ext4_quota_enable(struct super_block *sb, int type, int format_=
id,
 =09=09=09     unsigned int flags);
 static int ext4_enable_quotas(struct super_block *sb);
-static int ext4_get_next_id(struct super_block *sb, struct kqid *qid);
=20
 static struct dquot **ext4_get_dquots(struct inode *inode)
 {
@@ -1392,7 +1391,7 @@ static const struct dquot_operations ext4_quota_opera=
tions =3D {
 =09.destroy_dquot=09=09=3D dquot_destroy,
 =09.get_projid=09=09=3D ext4_get_projid,
 =09.get_inode_usage=09=3D ext4_get_inode_usage,
-=09.get_next_id=09=09=3D ext4_get_next_id,
+=09.get_next_id=09=09=3D dquot_get_next_id,
 };
=20
 static const struct quotactl_ops ext4_qctl_operations =3D {
@@ -6019,18 +6018,6 @@ static ssize_t ext4_quota_write(struct super_block *=
sb, int type,
 =09}
 =09return len;
 }
-
-static int ext4_get_next_id(struct super_block *sb, struct kqid *qid)
-{
-=09const struct quota_format_ops=09*ops;
-
-=09if (!sb_has_quota_loaded(sb, qid->type))
-=09=09return -ESRCH;
-=09ops =3D sb_dqopt(sb)->ops[qid->type];
-=09if (!ops || !ops->get_next_id)
-=09=09return -ENOSYS;
-=09return dquot_get_next_id(sb, qid);
-}
 #endif
=20
 static struct dentry *ext4_mount(struct file_system_type *fs_type, int fla=
gs,
--=20
2.21.0