xfs
[Top] [All Lists]

[PATCH 11/12] jfs: Convert to private i_dquot field

To: linux-fsdevel@xxxxxxxxxxxxxxx
Subject: [PATCH 11/12] jfs: Convert to private i_dquot field
From: Jan Kara <jack@xxxxxxx>
Date: Wed, 1 Oct 2014 21:31:33 +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: Dave Kleikamp <shaggy@xxxxxxxxxx>
CC: jfs-discussion@xxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Jan Kara <jack@xxxxxxx>
---
 fs/jfs/jfs_incore.h |  3 +++
 fs/jfs/super.c      | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index cf47f09e8ac8..fa7e795bd8ae 100644
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -94,6 +94,9 @@ struct jfs_inode_info {
                        unchar _inline_ea[128]; /* 128: inline extended attr */
                } link;
        } u;
+#ifdef CONFIG_QUOTA
+       struct dquot *i_dquot[MAXQUOTAS];
+#endif
        u32 dev;        /* will die when we get wide dev_t */
        struct inode    vfs_inode;
 };
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index adf8cb045b9e..d32b1ee9836d 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -54,6 +54,7 @@ static struct kmem_cache *jfs_inode_cachep;
 
 static const struct super_operations jfs_super_operations;
 static const struct export_operations jfs_export_operations;
+static const int jfs_inode_fields[IF_FIELD_NR];
 static struct file_system_type jfs_fs_type;
 
 #define MAX_COMMIT_THREADS 64
@@ -117,6 +118,9 @@ static struct inode *jfs_alloc_inode(struct super_block *sb)
        jfs_inode = kmem_cache_alloc(jfs_inode_cachep, GFP_NOFS);
        if (!jfs_inode)
                return NULL;
+#ifdef CONFIG_QUOTA
+       memset(&jfs_inode->i_dquot, 0, sizeof(jfs_inode->i_dquot));
+#endif
        return &jfs_inode->vfs_inode;
 }
 
@@ -537,7 +541,9 @@ static int jfs_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 = (1 << USRQUOTA) | (1 << GRPQUOTA);
 #endif
+       sb_init_inode_fields(sb, jfs_inode_fields);
 
        /*
         * Initialize direct-mapping inode/address-space
@@ -857,6 +863,13 @@ static const struct super_operations jfs_super_operations 
= {
 #endif
 };
 
+static const int jfs_inode_fields[IF_FIELD_NR] = {
+#ifdef CONFIG_QUOTA
+       [IF_DQUOTS] = (int)offsetof(struct js_inode_info, i_dquot) -
+                     (int)offsetof(struct jfs_inode_info, vfs_inode),
+#endif
+};
+
 static const struct export_operations jfs_export_operations = {
        .fh_to_dentry   = jfs_fh_to_dentry,
        .fh_to_parent   = jfs_fh_to_parent,
-- 
1.8.1.4

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