From: Barry Naujok <bnaujok@sgi.com>
Date: Mon, 23 Jul 2007 04:15:19 +0000 (+0000)
Subject: Fix up package creation with xfs_metadump and minor build warnings
X-Git-Tag: v2.10.0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e08f5594d84d23740e270bf10663a1801a244be0;p=thirdparty%2Fxfsprogs-dev.git

Fix up package creation with xfs_metadump and minor build warnings
Merge of master-melb:xfs-cmds:29196a by kenmcd.

  Add xfs_metadump.h to Makefile so it's packaged up correctly
---

diff --git a/include/Makefile b/include/Makefile
index 2cd523f33..345a0846b 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -26,8 +26,9 @@ HFILES = cache.h handle.h jdm.h libxfs.h libxlog.h list.h parent.h xfs.h xqm.h \
 	xfs_dir2_node.h xfs_dir2_sf.h xfs_dir_leaf.h xfs_dir_sf.h \
 	xfs_extfree_item.h xfs_fs.h xfs_ialloc.h xfs_ialloc_btree.h \
 	xfs_imap.h xfs_inode.h xfs_inode_item.h xfs_inum.h \
-	xfs_log.h xfs_log_priv.h xfs_log_recover.h xfs_mount.h xfs_quota.h \
-	xfs_rtalloc.h xfs_sb.h xfs_trans.h xfs_trans_space.h xfs_types.h
+	xfs_log.h xfs_log_priv.h xfs_log_recover.h xfs_metadata.h \
+	xfs_mount.h xfs_quota.hxfs_rtalloc.h xfs_sb.h \
+	xfs_trans.h xfs_trans_space.h xfs_types.h
 
 HFILES += $(PKG_PLATFORM).h swab.h
 PHFILES = darwin.h freebsd.h irix.h linux.h
diff --git a/libxfs/init.c b/libxfs/init.c
index fe288299f..e7d645f2c 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -205,7 +205,7 @@ check_open(char *path, int flags, char **rawfile, char **blockfile)
 	}
 	if (!readonly && !inactive && platform_check_ismounted(path, *blockfile, NULL, 1))
 		return 0;
-	
+
 	if (inactive && check_isactive(path, *blockfile, ((readonly|dangerously)?1:0)))
 		return 0;
 
@@ -737,4 +737,4 @@ unsigned long
 libxfs_physmem(void)
 {
 	return platform_physmem();
-}
\ No newline at end of file
+}
diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 830d0cf01..62937bfc7 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -571,24 +571,28 @@ libxfs_brelse(struct cache_node *node)
 	}
 }
 
-static void
+static unsigned int
 libxfs_bulkrelse(
 	struct cache 		*cache,
 	struct list_head 	*list)
 {
 	xfs_buf_t		*bp;
+	int			count = 0;
 
 	if (list_empty(list))
-		return;
+		return 0 ;
 
 	list_for_each_entry(bp, list, b_node.cn_mru) {
 		if (bp->b_flags & LIBXFS_B_DIRTY)
 			libxfs_writebufr(bp);
+		count++;
 	}
 
 	pthread_mutex_lock(&xfs_buf_freelist.cm_mutex);
 	__list_splice(list, &xfs_buf_freelist.cm_list);
 	pthread_mutex_unlock(&xfs_buf_freelist.cm_mutex);
+
+	return count;
 }
 
 static void