From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5564 invoked by alias); 19 Aug 2009 13:33:38 -0000 Received: (qmail 5557 invoked by alias); 19 Aug 2009 13:33:38 -0000 X-SWARE-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.2 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: gfs2-utils: master - gfs2_quota: Fix sparse error To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 3f99bb7f4ddf981332a0acc80c0df51084ae56ad X-Git-Newrev: 075fdcfb97f143f19991820cbc180d1952b043a4 From: andyp Message-Id: <20090819133310.12E73120215@lists.fedorahosted.org> Date: Wed, 19 Aug 2009 13:33:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00217.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=075fdcfb97f143f19991820cbc180d1952b043a4 Commit: 075fdcfb97f143f19991820cbc180d1952b043a4 Parent: 3f99bb7f4ddf981332a0acc80c0df51084ae56ad Author: Andrew Price AuthorDate: Wed Aug 19 09:24:32 2009 +0100 Committer: Andrew Price CommitterDate: Wed Aug 19 14:28:01 2009 +0100 gfs2_quota: Fix sparse error Fix sparse error "marked inline, but without a definition" and make write_quota_internal static as it's only used in main.c Signed-off-by: Andrew Price Acked-by: Bob Peterson --- gfs2/quota/gfs2_quota.h | 4 +--- gfs2/quota/main.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gfs2/quota/gfs2_quota.h b/gfs2/quota/gfs2_quota.h index 462246f..f15c25b 100644 --- a/gfs2/quota/gfs2_quota.h +++ b/gfs2/quota/gfs2_quota.h @@ -66,10 +66,8 @@ void cleanup(void); void read_superblock(struct gfs2_sb *sb, struct gfs2_sbd *sdp); void get_last_quota_id(int fd, uint32_t *max_id); int is_valid_quota_list(int fd); -inline void read_quota_internal(int fd, unsigned int id, int id_type, +void read_quota_internal(int fd, unsigned int id, int id_type, struct gfs2_quota *q); -inline void write_quota_internal(int fd, unsigned int id, int id_type, - struct gfs2_quota *q); void print_quota_list_warning(void); /* check.c */ diff --git a/gfs2/quota/main.c b/gfs2/quota/main.c index 16692dd..f80313d 100644 --- a/gfs2/quota/main.c +++ b/gfs2/quota/main.c @@ -308,7 +308,7 @@ read_superblock(struct gfs2_sb *sb, struct gfs2_sbd *sdp) close(fd); } -inline void +void read_quota_internal(int fd, uint32_t id, int id_type, struct gfs2_quota *q) { /* seek to the appropriate offset in the quota file and read the @@ -331,7 +331,7 @@ read_quota_internal(int fd, uint32_t id, int id_type, struct gfs2_quota *q) gfs2_quota_in(q, buf); } -inline void +static inline void write_quota_internal(int fd, uint32_t id, int id_type, struct gfs2_quota *q) { /* seek to the appropriate offset in the quota file and read the