diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-03-03 09:05:03 -0500 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2010-03-04 18:20:29 -0500 |
commit | b43fa8284d7790d9cca32c9c55e24f29be2fa33b (patch) | |
tree | acb7f205fe2a1ae324e0e11c50f43baaa6b8dfab /fs/ocfs2/file.c | |
parent | 759bfee658beab14af7b357156461d0eb852be2c (diff) |
dquot: cleanup dquot transfer routine
Get rid of the transfer dquot operation - it is now always called from
the filesystem and if a filesystem really needs it's own (which none
currently does) it can just call into it's own routine directly.
Rename the now static low-level dquot_transfer helper to __dquot_transfer
and vfs_dq_transfer to dquot_transfer to have a consistent namespace,
and make the new dquot_transfer return a normal negative errno value
which all callers expect.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ocfs2/file.c')
-rw-r--r-- | fs/ocfs2/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 6cf3d8d18369..472e8f8bc892 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -1020,7 +1020,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) | |||
1020 | /* | 1020 | /* |
1021 | * Gather pointers to quota structures so that allocation / | 1021 | * Gather pointers to quota structures so that allocation / |
1022 | * freeing of quota structures happens here and not inside | 1022 | * freeing of quota structures happens here and not inside |
1023 | * vfs_dq_transfer() where we have problems with lock ordering | 1023 | * dquot_transfer() where we have problems with lock ordering |
1024 | */ | 1024 | */ |
1025 | if (attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid | 1025 | if (attr->ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid |
1026 | && OCFS2_HAS_RO_COMPAT_FEATURE(sb, | 1026 | && OCFS2_HAS_RO_COMPAT_FEATURE(sb, |
@@ -1053,7 +1053,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) | |||
1053 | mlog_errno(status); | 1053 | mlog_errno(status); |
1054 | goto bail_unlock; | 1054 | goto bail_unlock; |
1055 | } | 1055 | } |
1056 | status = vfs_dq_transfer(inode, attr) ? -EDQUOT : 0; | 1056 | status = dquot_transfer(inode, attr); |
1057 | if (status < 0) | 1057 | if (status < 0) |
1058 | goto bail_commit; | 1058 | goto bail_commit; |
1059 | } else { | 1059 | } else { |