mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

quota: Remove ->get_xstate and ->get_xstatev callbacks 

These callbacks are now unused. Remove them.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Jan Kara 2014-11-19 16:44:58 +01:00
parent e54b2e2d72
commit 59b6ba6990
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/quota/quota.c
View File

@ -350,12 +350,9 @@ static int quota_getxstate(struct super_block *sb, void __user *addr)
struct fs_quota_stat fqs;
int ret;
if (!sb->s_qcop->get_xstate && !sb->s_qcop->get_state)
if (!sb->s_qcop->get_state)
return -ENOSYS;
if (sb->s_qcop->get_state)
ret = quota_getstate(sb, &fqs);
else
ret = sb->s_qcop->get_xstate(sb, &fqs);
ret = quota_getstate(sb, &fqs);
if (!ret && copy_to_user(addr, &fqs, sizeof(fqs)))
return -EFAULT;
return ret;
@ -414,7 +411,7 @@ static int quota_getxstatev(struct super_block *sb, void __user *addr)
struct fs_quota_statv fqs;
int ret;
if (!sb->s_qcop->get_xstatev && !sb->s_qcop->get_state)
if (!sb->s_qcop->get_state)
return -ENOSYS;
memset(&fqs, 0, sizeof(fqs));
@ -428,10 +425,7 @@ static int quota_getxstatev(struct super_block *sb, void __user *addr)
default:
return -EINVAL;
}
if (sb->s_qcop->get_state)
ret = quota_getstatev(sb, &fqs);
else
ret = sb->s_qcop->get_xstatev(sb, &fqs);
ret = quota_getstatev(sb, &fqs);
if (!ret && copy_to_user(addr, &fqs, sizeof(fqs)))
return -EFAULT;
return ret;

2
include/linux/quota.h
View File

@ -408,8 +408,6 @@ struct quotactl_ops {
int (*get_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
int (*set_dqblk)(struct super_block *, struct kqid, struct qc_dqblk *);
int (*get_state)(struct super_block *, struct qc_state *);
int (*get_xstate)(struct super_block *, struct fs_quota_stat *);
int (*get_xstatev)(struct super_block *, struct fs_quota_statv *);
int (*rm_xquota)(struct super_block *, unsigned int);
};