Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12755627 authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Jan Kara
Browse files

quota: unify quota init condition in setattr 



Quota must being initialized if size or uid/git changes requested.
But initialization performed in two different places:
in case of i_size file system is responsible for dquot init
, but in case of uid/gid init will be called internally in
dquot_transfer().
This ambiguity makes code harder to understand.
Let's move this logic to one common helper function.

Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent fcbc59f9

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ int ext2_setattr(struct dentry *dentry, struct iattr *iattr) 
	if (error)

		return error;



	if (iattr->ia_valid & ATTR_SIZE)

	if (is_quota_modification(inode, iattr))

		dquot_initialize(inode);

	if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||

	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {

fs/ext3/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -3151,7 +3151,7 @@ int ext3_setattr(struct dentry *dentry, struct iattr *attr) 
	if (error)

		return error;



	if (ia_valid & ATTR_SIZE)

	if (is_quota_modification(inode, attr))

		dquot_initialize(inode);

	if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||

		(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {

fs/ext4/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -5425,7 +5425,7 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) 
	if (error)

		return error;



	if (ia_valid & ATTR_SIZE)

	if (is_quota_modification(inode, attr))

		dquot_initialize(inode);

	if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||

		(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid)) {

fs/jfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ int jfs_setattr(struct dentry *dentry, struct iattr *iattr) 
	if (rc)

		return rc;



	if (iattr->ia_valid & ATTR_SIZE)

	if (is_quota_modification(inode, iattr))

		dquot_initialize(inode);

	if ((iattr->ia_valid & ATTR_UID && iattr->ia_uid != inode->i_uid) ||

	    (iattr->ia_valid & ATTR_GID && iattr->ia_gid != inode->i_gid)) {

fs/ocfs2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -966,10 +966,10 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
	if (status)

		return status;



	if (is_quota_modification(inode, attr))

		dquot_initialize(inode);

	size_change = S_ISREG(inode->i_mode) && attr->ia_valid & ATTR_SIZE;

	if (size_change) {

		dquot_initialize(inode);



		status = ocfs2_rw_lock(inode, 1);

		if (status < 0) {

			mlog_errno(status);