diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-03-03 09:05:02 -0500 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-03-05 00:20:28 +0100 |
| commit | 759bfee658beab14af7b357156461d0eb852be2c (patch) | |
| tree | 180cdedd004781ee67c30ce89951324d32910067 /fs/attr.c | |
| parent | 63936ddaa16b9486e2d426ed7b09f559a5c60f87 (diff) | |
| download | linux-759bfee658beab14af7b357156461d0eb852be2c.tar.bz2 | |
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/attr.c')
| -rw-r--r-- | fs/attr.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/attr.c b/fs/attr.c index 96d394bdaddf..0a6ea54cde7d 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -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,14 +211,8 @@ 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 (!error) + error = inode_setattr(inode, attr); } if (ia_valid & ATTR_SIZE) |