From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id n5CFYXcJ211990 for ; Fri, 12 Jun 2009 10:34:34 -0500 Received: from bombadil.infradead.org (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id 297A22F032E for ; Fri, 12 Jun 2009 08:34:56 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) by cuda.sgi.com with ESMTP id FaXGkGeiEtYHkqAB for ; Fri, 12 Jun 2009 08:34:56 -0700 (PDT) Received: from hch by bombadil.infradead.org with local (Exim 4.69 #1 (Red Hat Linux)) id 1MF8mN-0007Ak-Rf for xfs@oss.sgi.com; Fri, 12 Jun 2009 15:34:55 +0000 Date: Fri, 12 Jun 2009 11:34:55 -0400 From: Christoph Hellwig Subject: [PATCH] xfs: fix warnings with CONFIG_XFS_QUOTA disabled Message-ID: <20090612153454.GA26477@infradead.org> MIME-Version: 1.0 Content-Disposition: inline List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com Fix warnings about unitialized dquot variables by making sure xfs_qm_vop_dqalloc touches it even when quotas are disabled. Signed-off-by: Christoph Hellwig Index: xfs/fs/xfs/xfs_quota.h =================================================================== --- xfs.orig/fs/xfs/xfs_quota.h 2009-06-12 17:22:24.925939716 +0200 +++ xfs/fs/xfs/xfs_quota.h 2009-06-12 17:27:47.253814811 +0200 @@ -335,6 +335,14 @@ extern void xfs_qm_unmount(struct xfs_mo extern void xfs_qm_unmount_quotas(struct xfs_mount *); #else +static inline int +xfs_qm_vop_dqalloc(struct xfs_inode *ip, uid_t uid, gid_t gid, prid_t prid, + uint flags, struct xfs_dquot **udqp, struct xfs_dquot **gdqp) +{ + *udqp = NULL; + *gdqp = NULL; + return 0; +} #define xfs_trans_dup_dqinfo(tp, tp2) #define xfs_trans_free_dqinfo(tp) #define xfs_trans_mod_dquot_byino(tp, ip, fields, delta) @@ -342,7 +350,6 @@ extern void xfs_qm_unmount_quotas(struct #define xfs_trans_unreserve_and_mod_dquots(tp) #define xfs_trans_reserve_quota_nblks(tp, ip, nblks, ninos, flags) (0) #define xfs_trans_reserve_quota_bydquots(tp, mp, u, g, nb, ni, fl) (0) -#define xfs_qm_vop_dqalloc(ip, uid, gid, prid, fl, ou, og) (0) #define xfs_qm_vop_create_dqattach(tp, ip, u, g) #define xfs_qm_vop_rename_dqattach(it) (0) #define xfs_qm_vop_chown(tp, ip, old, new) (NULL) _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs