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

Commit 759bfee6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jan Kara
Browse files

dquot: move dquot transfer responsibility into the filesystem 



Currently notify_change calls vfs_dq_transfer directly.  This means
we tie the quota code into the VFS.  Get rid of that and make the
filesystem responsible for the transfer.  Most filesystems already
do this, only ufs and udf need the code added, and for jfs it needs to
be enabled unconditionally instead of only when ACLs are enabled.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 63936dda

fs/attr.c

+2 −9
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/capability.h>

#include <linux/fsnotify.h>

#include <linux/fcntl.h>

#include <linux/quotaops.h>

#include <linux/security.h>



/* Taken over from the old code... */
@@ -212,15 +211,9 @@ int notify_change(struct dentry * dentry, struct iattr * attr) 
		error = inode->i_op->setattr(dentry, attr);

	} else {

		error = inode_change_ok(inode, attr);

		if (!error) {

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

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

				error = vfs_dq_transfer(inode, attr) ?

					-EDQUOT : 0;

		if (!error)

			error = inode_setattr(inode, attr);

	}

	}



	if (ia_valid & ATTR_SIZE)

		up_write(&dentry->d_inode->i_alloc_sem);

fs/jfs/acl.c

+1 −25
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#include <linux/sched.h>

#include <linux/fs.h>

#include <linux/quotaops.h>

#include <linux/posix_acl_xattr.h>

#include "jfs_incore.h"

#include "jfs_txnmgr.h"
@@ -174,7 +173,7 @@ int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir) 
	return rc;

}



static int jfs_acl_chmod(struct inode *inode)

int jfs_acl_chmod(struct inode *inode)

{

	struct posix_acl *acl, *clone;

	int rc;
@@ -205,26 +204,3 @@ static int jfs_acl_chmod(struct inode *inode) 
	posix_acl_release(clone);

	return rc;

}
 


int jfs_setattr(struct dentry *dentry, struct iattr *iattr)

{

	struct inode *inode = dentry->d_inode;

	int rc;



	rc = inode_change_ok(inode, iattr);

	if (rc)

		return rc;



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

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

		if (vfs_dq_transfer(inode, iattr))

			return -EDQUOT;

	}



	rc = inode_setattr(inode, iattr);



	if (!rc && (iattr->ia_valid & ATTR_MODE))

		rc = jfs_acl_chmod(inode);



	return rc;

}

fs/jfs/file.c

+25 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 */



#include <linux/fs.h>

#include <linux/quotaops.h>

#include "jfs_incore.h"

#include "jfs_inode.h"

#include "jfs_dmap.h"
@@ -88,14 +89,37 @@ static int jfs_release(struct inode *inode, struct file *file) 
	return 0;

}



int jfs_setattr(struct dentry *dentry, struct iattr *iattr)

{

	struct inode *inode = dentry->d_inode;

	int rc;



	rc = inode_change_ok(inode, iattr);

	if (rc)

		return rc;



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

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

		if (vfs_dq_transfer(inode, iattr))

			return -EDQUOT;

	}



	rc = inode_setattr(inode, iattr);



	if (!rc && (iattr->ia_valid & ATTR_MODE))

		rc = jfs_acl_chmod(inode);



	return rc;

}



const struct inode_operations jfs_file_inode_operations = {

	.truncate	= jfs_truncate,

	.setxattr	= jfs_setxattr,

	.getxattr	= jfs_getxattr,

	.listxattr	= jfs_listxattr,

	.removexattr	= jfs_removexattr,

#ifdef CONFIG_JFS_POSIX_ACL

	.setattr	= jfs_setattr,

#ifdef CONFIG_JFS_POSIX_ACL

	.check_acl	= jfs_check_acl,

#endif

};

fs/jfs/jfs_acl.h

+6 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


int jfs_check_acl(struct inode *, int);

int jfs_init_acl(tid_t, struct inode *, struct inode *);

int jfs_setattr(struct dentry *, struct iattr *);

int jfs_acl_chmod(struct inode *inode);



#else
@@ -32,5 +32,10 @@ static inline int jfs_init_acl(tid_t tid, struct inode *inode, 
	return 0;

}



static inline int jfs_acl_chmod(struct inode *inode)

{

	return 0;

}



#endif

#endif		/* _H_JFS_ACL */

fs/jfs/jfs_inode.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid, 
	int fh_len, int fh_type);

extern void jfs_set_inode_flags(struct inode *);

extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);

extern int jfs_setattr(struct dentry *, struct iattr *);



extern const struct address_space_operations jfs_aops;

extern const struct inode_operations jfs_dir_inode_operations;