aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 07:33:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 07:33:37 -0800
commit4843456c5c341eb57f80f9224362a22665d14107 (patch)
tree5656b405a8b1d2596e8eb748b953ee677a261e3c /fs/ocfs2
parent2b1caf6ed7b888c95a1909d343799672731651a5 (diff)
parentf00c9e44ad1a9660fe8cd3ca15b6cd9497172eab (diff)
downloadkernel_samsung_tuna-4843456c5c341eb57f80f9224362a22665d14107.zip
kernel_samsung_tuna-4843456c5c341eb57f80f9224362a22665d14107.tar.gz
kernel_samsung_tuna-4843456c5c341eb57f80f9224362a22665d14107.tar.bz2
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: quota: Fix deadlock during path resolution
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/super.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 06d1f74..38f986d 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -993,8 +993,7 @@ static void ocfs2_disable_quotas(struct ocfs2_super *osb)
}
/* Handle quota on quotactl */
-static int ocfs2_quota_on(struct super_block *sb, int type, int format_id,
- char *path)
+static int ocfs2_quota_on(struct super_block *sb, int type, int format_id)
{
unsigned int feature[MAXQUOTAS] = { OCFS2_FEATURE_RO_COMPAT_USRQUOTA,
OCFS2_FEATURE_RO_COMPAT_GRPQUOTA};
@@ -1013,7 +1012,7 @@ static int ocfs2_quota_off(struct super_block *sb, int type)
}
static const struct quotactl_ops ocfs2_quotactl_ops = {
- .quota_on = ocfs2_quota_on,
+ .quota_on_meta = ocfs2_quota_on,
.quota_off = ocfs2_quota_off,
.quota_sync = dquot_quota_sync,
.get_info = dquot_get_dqinfo,