From: Jan Kara <jack@suse.cz>
To: linux-fsdevel@vger.kernel.org
Cc: Dave Kleikamp <shaggy@kernel.org>,
jfs-discussion@lists.sourceforge.net, tytso@mit.edu,
Jeff Mahoney <jeffm@suse.de>, Mark Fasheh <mfasheh@suse.com>,
Dave Chinner <david@fromorbit.com>,
reiserfs-devel@vger.kernel.org, xfs@oss.sgi.com,
cluster-devel@redhat.com, Joel Becker <jlbec@evilplan.org>,
Jan Kara <jack@suse.cz>,
linux-ext4@vger.kernel.org,
Steven Whitehouse <swhiteho@redhat.com>,
ocfs2-devel@oss.oracle.com, viro@zeniv.linux.org.uk
Subject: [PATCH 06/12] ext2: Convert to private i_dquot field
Date: Fri, 10 Oct 2014 16:55:04 +0200 [thread overview]
Message-ID: <1412952910-7142-7-git-send-email-jack@suse.cz> (raw)
In-Reply-To: <1412952910-7142-1-git-send-email-jack@suse.cz>
CC: linux-ext4@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/ext2/ext2.h | 3 +++
fs/ext2/super.c | 13 +++++++++++++
2 files changed, 16 insertions(+)
diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index d9a17d0b124d..e4279ead4a05 100644
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -689,6 +689,9 @@ struct ext2_inode_info {
struct mutex truncate_mutex;
struct inode vfs_inode;
struct list_head i_orphan; /* unlinked but open inodes */
+#ifdef CONFIG_QUOTA
+ struct dquot *i_dquot[MAXQUOTAS];
+#endif
};
/*
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index b88edc05c230..47d97af2ebcd 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -166,6 +166,10 @@ static struct inode *ext2_alloc_inode(struct super_block *sb)
return NULL;
ei->i_block_alloc_info = NULL;
ei->vfs_inode.i_version = 1;
+#ifdef CONFIG_QUOTA
+ memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));
+#endif
+
return &ei->vfs_inode;
}
@@ -323,6 +327,13 @@ static const struct super_operations ext2_sops = {
#endif
};
+static const int ext2_inode_fields[IF_FIELD_NR] = {
+#ifdef CONFIG_QUOTA
+ [IF_DQUOTS] = offsetof(struct ext2_inode_info, i_dquot) -
+ offsetof(struct ext2_inode_info, vfs_inode),
+#endif
+};
+
static struct inode *ext2_nfs_get_inode(struct super_block *sb,
u64 ino, u32 generation)
{
@@ -1090,7 +1101,9 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
#ifdef CONFIG_QUOTA
sb->dq_op = &dquot_operations;
sb->s_qcop = &dquot_quotactl_ops;
+ sb_dqopt(sb)->allowed_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;
#endif
+ sb_init_inode_fields(sb, ext2_inode_fields);
root = ext2_iget(sb, EXT2_ROOT_INO);
if (IS_ERR(root)) {
--
1.8.1.4
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
next prev parent reply other threads:[~2014-10-10 14:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 14:54 [PATCH 0/12 v2] Moving i_dquot out of struct inode Jan Kara
2014-10-10 14:54 ` [PATCH 01/12] quota: Allow each filesystem to specify which quota types it supports Jan Kara
2014-10-10 15:26 ` Dave Kleikamp
2014-10-10 15:37 ` Jan Kara
2014-10-10 14:55 ` [PATCH 02/12] gfs2: Set allowed quota types Jan Kara
2014-10-10 14:55 ` [PATCH 03/12] xfs: " Jan Kara
2014-10-10 14:55 ` [PATCH 04/12] fs: Generic infrastructure for optional inode fields Jan Kara
2014-10-10 14:55 ` [PATCH 05/12] quota: Use optional inode field for i_dquot pointers Jan Kara
2014-10-10 14:55 ` Jan Kara [this message]
2014-10-10 14:55 ` [PATCH 07/12] ext3: Convert to private i_dquot field Jan Kara
2014-10-10 14:55 ` [PATCH 08/12] ext4: " Jan Kara
2014-10-10 14:55 ` [PATCH 09/12] ocfs2: " Jan Kara
2014-10-10 14:55 ` [PATCH 10/12] reiserfs: " Jan Kara
2014-10-10 14:55 ` [PATCH 11/12] jfs: " Jan Kara
2014-10-10 15:33 ` Dave Kleikamp
2014-10-10 15:40 ` Jan Kara
2014-10-10 15:43 ` Dave Kleikamp
2014-10-10 14:55 ` [PATCH 12/12] vfs: Remove i_dquot field from inode Jan Kara
2014-10-11 13:34 ` [PATCH 0/12 v2] Moving i_dquot out of struct inode Christoph Hellwig
2014-10-12 18:53 ` Al Viro
2014-10-17 19:24 ` Jan Kara
2014-10-18 15:17 ` Christoph Hellwig
2014-10-18 19:26 ` Jan Kara
2014-10-19 14:16 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2014-11-04 11:19 [PATCH 0/12 v4] " Jan Kara
2014-11-04 11:19 ` [PATCH 06/12] ext2: Convert to private i_dquot field Jan Kara
2014-10-21 14:38 [PATCH 0/12 v3] Moving i_dquot out of struct inode Jan Kara
2014-10-21 14:38 ` [PATCH 06/12] ext2: Convert to private i_dquot field Jan Kara
2014-10-01 19:31 [PATCH 0/12 RFC] Moving i_dquot out of struct inode Jan Kara
2014-10-01 19:31 ` [PATCH 06/12] ext2: Convert to private i_dquot field Jan Kara
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=1412952910-7142-7-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--cc=cluster-devel@redhat.com \
--cc=david@fromorbit.com \
--cc=jeffm@suse.de \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=jlbec@evilplan.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mfasheh@suse.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=reiserfs-devel@vger.kernel.org \
--cc=shaggy@kernel.org \
--cc=swhiteho@redhat.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=xfs@oss.sgi.com \
/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).