Commit 53873638 authored by Jan Kara's avatar Jan Kara
Browse files

reiserfs: Convert to private i_dquot field 



CC: reiserfs-devel@vger.kernel.org
CC: Jeff Mahoney <jeffm@suse.de>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 1c92ec67

fs/reiserfs/reiserfs.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,10 @@ struct reiserfs_inode_info { 
#ifdef CONFIG_REISERFS_FS_XATTR

#ifdef CONFIG_REISERFS_FS_XATTR

	struct rw_semaphore i_xattr_sem;

	struct rw_semaphore i_xattr_sem;

#endif

#endif

#ifdef CONFIG_QUOTA

	struct dquot *i_dquot[MAXQUOTAS];

#endif



	struct inode vfs_inode;

	struct inode vfs_inode;

};

};

fs/reiserfs/super.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -594,6 +594,10 @@ static struct inode *reiserfs_alloc_inode(struct super_block *sb) 
		return NULL;

		return NULL;

	atomic_set(&ei->openers, 0);

	atomic_set(&ei->openers, 0);

	mutex_init(&ei->tailpack);

	mutex_init(&ei->tailpack);

#ifdef CONFIG_QUOTA

	memset(&ei->i_dquot, 0, sizeof(ei->i_dquot));

#endif



	return &ei->vfs_inode;

	return &ei->vfs_inode;

}

}
@@ -750,6 +754,11 @@ static ssize_t reiserfs_quota_write(struct super_block *, int, const char *, 
				    size_t, loff_t);

				    size_t, loff_t);

static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t,

static ssize_t reiserfs_quota_read(struct super_block *, int, char *, size_t,

				   loff_t);

				   loff_t);



static struct dquot **reiserfs_get_dquots(struct inode *inode)

{

	return REISERFS_I(inode)->i_dquot;

}

#endif

#endif





static const struct super_operations reiserfs_sops = {

static const struct super_operations reiserfs_sops = {
@@ -768,6 +777,7 @@ static const struct super_operations reiserfs_sops = { 
#ifdef CONFIG_QUOTA

#ifdef CONFIG_QUOTA

	.quota_read = reiserfs_quota_read,

	.quota_read = reiserfs_quota_read,

	.quota_write = reiserfs_quota_write,

	.quota_write = reiserfs_quota_write,

	.get_dquots = reiserfs_get_dquots,

#endif

#endif

};

};
@@ -1633,6 +1643,7 @@ static int read_super_block(struct super_block *s, int offset) 
#ifdef CONFIG_QUOTA

#ifdef CONFIG_QUOTA

	s->s_qcop = &reiserfs_qctl_operations;

	s->s_qcop = &reiserfs_qctl_operations;

	s->dq_op = &reiserfs_quota_operations;

	s->dq_op = &reiserfs_quota_operations;

	s->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP;

#endif

#endif





	/*

	/*