From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-fsdevel@vger.kernel.org
Cc: Richard Weinberger <richard@nod.at>,
Sascha Hauer <s.hauer@pengutronix.de>,
linux-mtd@lists.infradead.org, kernel@pengutronix.de,
Jan Kara <jack@suse.com>
Subject: [PATCH 02/10] quota: Pass sb to vfs_load_quota_inode()
Date: Wed, 30 Oct 2019 16:26:54 +0100 [thread overview]
Message-ID: <20191030152702.14269-3-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20191030152702.14269-1-s.hauer@pengutronix.de>
As a preparation to support filesystems that do not store quota files in
an inode pass the superblock to vfs_load_quota_inode(). With this we no
longer have to get the superblock from the inode and thus the inode
could be NULL.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
fs/quota/dquot.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 59f31735fe79..bbe3be21ff43 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2303,11 +2303,11 @@ EXPORT_SYMBOL(dquot_quota_off);
* Helper function to turn quotas on when we already have the inode of
* quota file and no quota information is loaded.
*/
-static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
+static int vfs_load_quota_inode(struct super_block *sb, struct inode *inode,
+ int type, int format_id,
unsigned int flags)
{
struct quota_format_type *fmt = find_quota_format(format_id);
- struct super_block *sb = inode->i_sb;
struct quota_info *dqopt = sb_dqopt(sb);
int error;
@@ -2443,7 +2443,7 @@ int dquot_resume(struct super_block *sb, int type)
spin_unlock(&dq_state_lock);
flags = dquot_generic_flag(flags, cnt);
- ret = vfs_load_quota_inode(inode, cnt,
+ ret = vfs_load_quota_inode(sb, inode, cnt,
dqopt->info[cnt].dqi_fmt_id, flags);
iput(inode);
}
@@ -2462,7 +2462,7 @@ int dquot_quota_on(struct super_block *sb, int type, int format_id,
if (path->dentry->d_sb != sb)
error = -EXDEV;
else
- error = vfs_load_quota_inode(d_inode(path->dentry), type,
+ error = vfs_load_quota_inode(sb, d_inode(path->dentry), type,
format_id, DQUOT_USAGE_ENABLED |
DQUOT_LIMITS_ENABLED);
return error;
@@ -2500,7 +2500,7 @@ int dquot_enable(struct inode *inode, int type, int format_id,
return 0;
}
- return vfs_load_quota_inode(inode, type, format_id, flags);
+ return vfs_load_quota_inode(sb, inode, type, format_id, flags);
}
EXPORT_SYMBOL(dquot_enable);
@@ -2525,7 +2525,7 @@ int dquot_quota_on_mount(struct super_block *sb, char *qf_name,
error = security_quota_on(dentry);
if (!error)
- error = vfs_load_quota_inode(d_inode(dentry), type, format_id,
+ error = vfs_load_quota_inode(sb, d_inode(dentry), type, format_id,
DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED);
out:
--
2.24.0.rc1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-10-30 15:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 15:26 [PATCH v2 00/10] Add quota support to UBIFS Sascha Hauer
2019-10-30 15:26 ` [PATCH 01/10] quota: Make inode optional Sascha Hauer
2019-11-01 18:07 ` Jan Kara
2019-11-04 7:48 ` Sascha Hauer
2019-10-30 15:26 ` Sascha Hauer [this message]
2019-10-30 15:26 ` [PATCH 03/10] quota: Introduce dquot_enable_sb() Sascha Hauer
2019-10-30 15:26 ` [PATCH 04/10] quota: Allow to pass mount path to quotactl Sascha Hauer
2019-11-01 16:07 ` Jan Kara
2019-11-11 10:08 ` Sascha Hauer
2019-11-11 11:05 ` Jan Kara
2019-11-11 11:14 ` Sascha Hauer
2019-10-30 15:26 ` [PATCH 05/10] ubifs: move checks and preparation into setflags() Sascha Hauer
2019-10-30 15:26 ` [PATCH 06/10] ubifs: Add support for FS_IOC_FS[SG]ETXATTR ioctls Sascha Hauer
2019-10-30 15:26 ` [PATCH 07/10] ubifs: do not ubifs_inode() on potentially NULL pointer Sascha Hauer
2019-10-30 15:27 ` [PATCH 08/10] ubifs: Add support for project id Sascha Hauer
2019-10-30 15:27 ` [PATCH 09/10] ubifs: export get_znode Sascha Hauer
2019-10-30 15:27 ` [PATCH 10/10] ubifs: Add quota support Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191030152702.14269-3-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=jack@suse.com \
--cc=kernel@pengutronix.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).