xfs
[Top] [All Lists]

[PATCH 10/12] reiserfs: Convert to private i_dquot field

To: linux-fsdevel@xxxxxxxxxxxxxxx
Subject: [PATCH 10/12] reiserfs: Convert to private i_dquot field
From: Jan Kara <jack@xxxxxxx>
Date: Wed, 1 Oct 2014 21:31:32 +0200
Cc: linux-ext4@xxxxxxxxxxxxxxx, Dave Chinner <david@xxxxxxxxxxxxx>, xfs@xxxxxxxxxxx, cluster-devel@xxxxxxxxxx, Steven Whitehouse <swhiteho@xxxxxxxxxx>, Mark Fasheh <mfasheh@xxxxxxxx>, Joel Becker <jlbec@xxxxxxxxxxxx>, ocfs2-devel@xxxxxxxxxxxxxx, reiserfs-devel@xxxxxxxxxxxxxxx, Jeff Mahoney <jeffm@xxxxxxx>, Dave Kleikamp <shaggy@xxxxxxxxxx>, jfs-discussion@xxxxxxxxxxxxxxxxxxxxx, tytso@xxxxxxx, Jan Kara <jack@xxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1412191894-9113-1-git-send-email-jack@xxxxxxx>
References: <1412191894-9113-1-git-send-email-jack@xxxxxxx>
CC: reiserfs-devel@xxxxxxxxxxxxxxx
CC: Jeff Mahoney <jeffm@xxxxxxx>
Signed-off-by: Jan Kara <jack@xxxxxxx>
---
 fs/reiserfs/reiserfs.h |  4 ++++
 fs/reiserfs/super.c    | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index 735c2c2b4536..197e59cbeb1c 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -97,6 +97,10 @@ struct reiserfs_inode_info {
 #ifdef CONFIG_REISERFS_FS_XATTR
        struct rw_semaphore i_xattr_sem;
 #endif
+#ifdef CONFIG_QUOTA
+       struct dquot *i_dquot[MAXQUOTAS];
+#endif
+
        struct inode vfs_inode;
 };
 
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index d46e88a33b02..c39227ded8f2 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -594,6 +594,10 @@ static struct inode *reiserfs_alloc_inode(struct 
super_block *sb)
                return NULL;
        atomic_set(&ei->openers, 0);
        mutex_init(&ei->tailpack);
+#ifdef CONFIG_QUOTA
+       memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));
+#endif
+
        return &ei->vfs_inode;
 }
 
@@ -771,6 +775,13 @@ static const struct super_operations reiserfs_sops = {
 #endif
 };
 
+static const int reiserfs_inode_fields[IF_FIELD_NR] = {
+#ifdef CONFIG_QUOTA
+       [IF_DQUOTS] = (int)offsetof(struct reiserfs_inode_info, i_dquot) -
+                     (int)offsetof(struct reiserfs_inode_info, vfs_inode),
+#endif
+};
+
 #ifdef CONFIG_QUOTA
 #define QTYPE2NAME(t) ((t)==USRQUOTA?"user":"group")
 
@@ -1633,7 +1644,9 @@ static int read_super_block(struct super_block *s, int 
offset)
 #ifdef CONFIG_QUOTA
        s->s_qcop = &reiserfs_qctl_operations;
        s->dq_op = &reiserfs_quota_operations;
+       sb_dqopt(s)->allowed_types = (1 << USRQUOTA) | (1 << GRPQUOTA);
 #endif
+       sb_init_inode_fields(s, reiserfs_inode_fields);
 
        /*
         * new format is limited by the 32 bit wide i_blocks field, want to
-- 
1.8.1.4

<Prev in Thread] Current Thread [Next in Thread>