From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (unknown [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 607E77F99 for ; Fri, 16 Jan 2015 06:48:25 -0600 (CST) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 96BCFAC003 for ; Fri, 16 Jan 2015 04:48:09 -0800 (PST) Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by cuda.sgi.com with ESMTP id TvCbnJaaHZk3HSr5 (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Fri, 16 Jan 2015 04:48:06 -0800 (PST) From: Jan Kara Subject: [PATCH 06/17] quota: Remove quota_on_meta callback Date: Fri, 16 Jan 2015 13:47:40 +0100 Message-Id: <1421412471-4747-7-git-send-email-jack@suse.cz> In-Reply-To: <1421412471-4747-1-git-send-email-jack@suse.cz> References: <1421412471-4747-1-git-send-email-jack@suse.cz> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: linux-fsdevel@vger.kernel.org Cc: cluster-devel@redhat.com, Jan Kara , ocfs2-devel@oss.oracle.com, xfs@oss.sgi.com There are no more users for quota_on_meta callback. Just remove it. Signed-off-by: Jan Kara --- fs/quota/quota.c | 5 +---- include/linux/quota.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/quota/quota.c b/fs/quota/quota.c index 748716ffee48..f30f9c4ce784 100644 --- a/fs/quota/quota.c +++ b/fs/quota/quota.c @@ -82,11 +82,8 @@ unsigned int qtype_limit_flag(int type) static int quota_quotaon(struct super_block *sb, int type, int cmd, qid_t id, struct path *path) { - if (!sb->s_qcop->quota_on && !sb->s_qcop->quota_on_meta && - !sb->s_qcop->quota_enable) + if (!sb->s_qcop->quota_on && !sb->s_qcop->quota_enable) return -ENOSYS; - if (sb->s_qcop->quota_on_meta) - return sb->s_qcop->quota_on_meta(sb, type, id); if (sb->s_qcop->quota_enable) return sb->s_qcop->quota_enable(sb, qtype_limit_flag(type)); if (IS_ERR(path)) diff --git a/include/linux/quota.h b/include/linux/quota.h index 79e8b03f75fb..90853585a9f9 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -326,7 +326,6 @@ struct path; /* Operations handling requests from userspace */ struct quotactl_ops { int (*quota_on)(struct super_block *, int, int, struct path *); - int (*quota_on_meta)(struct super_block *, int, int); int (*quota_off)(struct super_block *, int); int (*quota_enable)(struct super_block *, unsigned int); int (*quota_disable)(struct super_block *, unsigned int); -- 2.1.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs