From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25216 invoked by alias); 19 Aug 2009 14:36:31 -0000 Received: (qmail 25204 invoked by alias); 19 Aug 2009 14:36:30 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.4 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: cluster: STABLE3 - gfs2_quota: Fix sparse error To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 43869f6ad3cb6a401a52b8455b00bfa86d3af422 X-Git-Newrev: 634dc32a17ddf0c571d34b798c7124e4de942445 From: andyp Message-Id: <20090819143559.E5F64120215@lists.fedorahosted.org> Date: Wed, 19 Aug 2009 14:36: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/msg00221.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=634dc32a17ddf0c571d34b798c7124e4de942445 Commit: 634dc32a17ddf0c571d34b798c7124e4de942445 Parent: 43869f6ad3cb6a401a52b8455b00bfa86d3af422 Author: Andrew Price AuthorDate: Wed Aug 19 09:24:32 2009 +0100 Committer: Andrew Price CommitterDate: Wed Aug 19 15:30:34 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 a160897..83de4db 100644 --- a/gfs2/quota/main.c +++ b/gfs2/quota/main.c @@ -306,7 +306,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 @@ -329,7 +329,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