aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/file.c4
-rw-r--r--fs/ocfs2/quota_global.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 6cf3d8d1836..472e8f8bc89 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 {
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index ed96b3eeb13..b654bd103b6 100644
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -853,7 +853,6 @@ static void ocfs2_destroy_dquot(struct dquot *dquot)
853const struct dquot_operations ocfs2_quota_operations = { 853const struct dquot_operations ocfs2_quota_operations = {
854 .initialize = dquot_initialize, 854 .initialize = dquot_initialize,
855 .drop = dquot_drop, 855 .drop = dquot_drop,
856 .transfer = dquot_transfer,
857 .write_dquot = ocfs2_write_dquot, 856 .write_dquot = ocfs2_write_dquot,
858 .acquire_dquot = ocfs2_acquire_dquot, 857 .acquire_dquot = ocfs2_acquire_dquot,
859 .release_dquot = ocfs2_release_dquot, 858 .release_dquot = ocfs2_release_dquot,