From 2ea354c3bb84ae08a122625af3411a49948daf5f Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sat, 22 Nov 1997 07:00:40 +0000 Subject: [PATCH] Unremoved prtrealloc and the declaration of ffs_clusteralloc(). These are used in the `#ifdef notyet' case :-). This case is used except in the `#if !defined (not_yes)' case :-|. This has something to do with the `#ifdef notyet_block_reallocation_enabled' case in vfs_cluster.c :-(. --- sys/ufs/ffs/ffs_alloc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 091a39330470..c32f07a1bdaf 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95 - * $Id: ffs_alloc.c,v 1.41 1997/10/16 20:32:33 phk Exp $ + * $Id: ffs_alloc.c,v 1.42 1997/11/07 08:53:34 phk Exp $ */ #include "opt_quota.h" @@ -60,6 +60,10 @@ static ufs_daddr_t ffs_alloccg __P((struct inode *, int, ufs_daddr_t, int)); static ufs_daddr_t ffs_alloccgblk __P((struct fs *, struct cg *, ufs_daddr_t)); static void ffs_clusteracct __P((struct fs *, struct cg *, ufs_daddr_t, int)); +#ifdef notyet +static ufs_daddr_t ffs_clusteralloc __P((struct inode *, int, ufs_daddr_t, + int)); +#endif static ino_t ffs_dirpref __P((struct fs *)); static ufs_daddr_t ffs_fragextend __P((struct inode *, int, long, int, int)); static void ffs_fserr __P((struct fs *, u_int, char *)); @@ -313,6 +317,7 @@ nospace: return (ENOSPC); } +#ifdef notyet /* * Reallocate a sequence of blocks into a contiguous sequence of blocks. * @@ -333,6 +338,9 @@ SYSCTL_INT(_vfs_ffs, FFS_ASYNCFREE, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, "" int doreallocblks = 1; SYSCTL_INT(_vfs_ffs, FFS_REALLOCBLKS, doreallocblks, CTLFLAG_RW, &doreallocblks, 0, ""); +static int prtrealloc = 0; +#endif + int ffs_reallocblks(ap) struct vop_reallocblks_args /* {