diff options
author | Jan Kara <jack@suse.cz> | 2014-10-08 12:35:31 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2015-01-30 06:51:10 -0500 |
commit | aaa3daed156ff3c6acb28c8b18028f8b57d6c91b (patch) | |
tree | 1293cc79bf3e4c7afae7a1a17b308b5411e3f130 | |
parent | 664dbd5fe5485ccb20dbec0081c1033308999220 (diff) |
quota: Remove quota_on_meta callback
There are no more users for quota_on_meta callback. Just remove it.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r-- | fs/quota/quota.c | 5 | ||||
-rw-r--r-- | include/linux/quota.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/fs/quota/quota.c b/fs/quota/quota.c index ce78a70a596f..d14a799c7785 100644 --- a/fs/quota/quota.c +++ b/fs/quota/quota.c | |||
@@ -82,11 +82,8 @@ unsigned int qtype_enforce_flag(int type) | |||
82 | static int quota_quotaon(struct super_block *sb, int type, int cmd, qid_t id, | 82 | static int quota_quotaon(struct super_block *sb, int type, int cmd, qid_t id, |
83 | struct path *path) | 83 | struct path *path) |
84 | { | 84 | { |
85 | if (!sb->s_qcop->quota_on && !sb->s_qcop->quota_on_meta && | 85 | if (!sb->s_qcop->quota_on && !sb->s_qcop->quota_enable) |
86 | !sb->s_qcop->quota_enable) | ||
87 | return -ENOSYS; | 86 | return -ENOSYS; |
88 | if (sb->s_qcop->quota_on_meta) | ||
89 | return sb->s_qcop->quota_on_meta(sb, type, id); | ||
90 | if (sb->s_qcop->quota_enable) | 87 | if (sb->s_qcop->quota_enable) |
91 | return sb->s_qcop->quota_enable(sb, qtype_enforce_flag(type)); | 88 | return sb->s_qcop->quota_enable(sb, qtype_enforce_flag(type)); |
92 | if (IS_ERR(path)) | 89 | if (IS_ERR(path)) |
diff --git a/include/linux/quota.h b/include/linux/quota.h index 4da497b807c4..0938159d65c8 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h | |||
@@ -369,7 +369,6 @@ struct qc_dqblk { | |||
369 | /* Operations handling requests from userspace */ | 369 | /* Operations handling requests from userspace */ |
370 | struct quotactl_ops { | 370 | struct quotactl_ops { |
371 | int (*quota_on)(struct super_block *, int, int, struct path *); | 371 | int (*quota_on)(struct super_block *, int, int, struct path *); |
372 | int (*quota_on_meta)(struct super_block *, int, int); | ||
373 | int (*quota_off)(struct super_block *, int); | 372 | int (*quota_off)(struct super_block *, int); |
374 | int (*quota_enable)(struct super_block *, unsigned int); | 373 | int (*quota_enable)(struct super_block *, unsigned int); |
375 | int (*quota_disable)(struct super_block *, unsigned int); | 374 | int (*quota_disable)(struct super_block *, unsigned int); |