diff options
author | Dmitry Monakhov <dmonakhov@openvz.org> | 2010-04-08 14:04:20 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-05-21 13:30:45 -0400 |
commit | 12755627bdcddcdb30a1bfb9a09395a52b1d6838 (patch) | |
tree | b2d69696975d5457648020324f683a45302fbf3c /fs/reiserfs | |
parent | fcbc59f96e38a0999e827be9d04d46b62b53b20a (diff) |
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: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r-- | fs/reiserfs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index dc2c65e04853..0f22fdaf54ac 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
@@ -3076,9 +3076,10 @@ int reiserfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
3076 | ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID); | 3076 | ia_valid = attr->ia_valid &= ~(ATTR_KILL_SUID|ATTR_KILL_SGID); |
3077 | 3077 | ||
3078 | depth = reiserfs_write_lock_once(inode->i_sb); | 3078 | depth = reiserfs_write_lock_once(inode->i_sb); |
3079 | if (attr->ia_valid & ATTR_SIZE) { | 3079 | if (is_quota_modification(inode, attr)) |
3080 | dquot_initialize(inode); | 3080 | dquot_initialize(inode); |
3081 | 3081 | ||
3082 | if (attr->ia_valid & ATTR_SIZE) { | ||
3082 | /* version 2 items will be caught by the s_maxbytes check | 3083 | /* version 2 items will be caught by the s_maxbytes check |
3083 | ** done for us in vmtruncate | 3084 | ** done for us in vmtruncate |
3084 | */ | 3085 | */ |