All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ext4: code cleanup for get_next_id
@ 2019-10-06 10:30 Chengguang Xu
  2019-11-15  3:16 ` Theodore Y. Ts'o
  0 siblings, 1 reply; 2+ messages in thread
From: Chengguang Xu @ 2019-10-06 10:30 UTC (permalink / raw
  To: tytso, adilger.kernel; +Cc: linux-ext4, Chengguang Xu

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 *sb, int type,
 static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
 			     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);
 
 static struct dquot **ext4_get_dquots(struct inode *inode)
 {
@@ -1392,7 +1391,7 @@ static const struct dquot_operations ext4_quota_operations = {
 	.destroy_dquot		= dquot_destroy,
 	.get_projid		= ext4_get_projid,
 	.get_inode_usage	= ext4_get_inode_usage,
-	.get_next_id		= ext4_get_next_id,
+	.get_next_id		= dquot_get_next_id,
 };
 
 static const struct quotactl_ops ext4_qctl_operations = {
@@ -6019,18 +6018,6 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
 	}
 	return len;
 }
-
-static int ext4_get_next_id(struct super_block *sb, struct kqid *qid)
-{
-	const struct quota_format_ops	*ops;
-
-	if (!sb_has_quota_loaded(sb, qid->type))
-		return -ESRCH;
-	ops = sb_dqopt(sb)->ops[qid->type];
-	if (!ops || !ops->get_next_id)
-		return -ENOSYS;
-	return dquot_get_next_id(sb, qid);
-}
 #endif
 
 static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags,
-- 
2.21.0




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ext4: code cleanup for get_next_id
  2019-10-06 10:30 [PATCH] ext4: code cleanup for get_next_id Chengguang Xu
@ 2019-11-15  3:16 ` Theodore Y. Ts'o
  0 siblings, 0 replies; 2+ messages in thread
From: Theodore Y. Ts'o @ 2019-11-15  3:16 UTC (permalink / raw
  To: Chengguang Xu; +Cc: adilger.kernel, linux-ext4

On Sun, Oct 06, 2019 at 06:30:28PM +0800, Chengguang Xu wrote:
> 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>

Thanks, applied.

					- Ted

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-11-15  3:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-06 10:30 [PATCH] ext4: code cleanup for get_next_id Chengguang Xu
2019-11-15  3:16 ` Theodore Y. Ts'o

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.