- Change some function parameters so that the ufsmount structure is

   accessable in places where the ufs lock will be needed.

Sponsored By:	Isilon Systems, Inc.

1 files changed, 4 insertions, 3 deletions

diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 6de7a82..4e27092 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -55,17 +55,18 @@ int	ffs_balloc_ufs1(struct vnode *a_vp, off_t a_startoffset, int a_size,
 int	ffs_balloc_ufs2(struct vnode *a_vp, off_t a_startoffset, int a_size,
             struct ucred *a_cred, int a_flags, struct buf **a_bpp);
 int	ffs_blkatoff(struct vnode *, off_t, char **, struct buf **);
-void	ffs_blkfree(struct fs *, struct vnode *, ufs2_daddr_t, long, ino_t);
+void	ffs_blkfree(struct ufsmount *, struct fs *, struct vnode *,
+	    ufs2_daddr_t, long, ino_t);
 ufs2_daddr_t ffs_blkpref_ufs1(struct inode *, ufs_lbn_t, int, ufs1_daddr_t *);
 ufs2_daddr_t ffs_blkpref_ufs2(struct inode *, ufs_lbn_t, int, ufs2_daddr_t *);
 int	ffs_checkfreefile(struct fs *, struct vnode *, ino_t);
 void	ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t);
-void	ffs_clusteracct	(struct fs *, struct cg *, ufs1_daddr_t, int);
 int	ffs_copyonwrite(struct vnode *, struct buf *);
 vfs_fhtovp_t ffs_fhtovp;
 int	ffs_flushfiles(struct mount *, int, struct thread *);
 void	ffs_fragacct(struct fs *, int, int32_t [], int);
-int	ffs_freefile(struct fs *, struct vnode *, ino_t, int);
+int	ffs_freefile(struct ufsmount *, struct fs *, struct vnode *, ino_t,
+	    int);
 int	ffs_isblock(struct fs *, u_char *, ufs1_daddr_t);
 void	ffs_load_inode(struct buf *, struct inode *, struct fs *, ino_t);
 int	ffs_mountroot(void);