Date: Sun, 20 Oct 2013 20:41:38 +0000 (UTC) From: Kirk McKusick <mckusick@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256801 - head/sys/ufs/ffs Message-ID: <201310202041.r9KKfc3a059692@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mckusick Date: Sun Oct 20 20:41:38 2013 New Revision: 256801 URL: http://svnweb.freebsd.org/changeset/base/256801 Log: First of several cleanups to soft dependency implementation. Convert three functions exported from ffs_softdep.c to static functions as they are not used outside of ffs_softdep.c. No functional change. Tested by: Peter Holm and Scott Long Sponsored by: Netflix Modified: head/sys/ufs/ffs/ffs_extern.h head/sys/ufs/ffs/ffs_softdep.c Modified: head/sys/ufs/ffs/ffs_extern.h ============================================================================== --- head/sys/ufs/ffs/ffs_extern.h Sun Oct 20 20:10:31 2013 (r256800) +++ head/sys/ufs/ffs/ffs_extern.h Sun Oct 20 20:41:38 2013 (r256801) @@ -152,9 +152,7 @@ void softdep_setup_sbupdate(struct ufsmo void softdep_fsync_mountdev(struct vnode *); int softdep_sync_metadata(struct vnode *); int softdep_sync_buf(struct vnode *, struct buf *, int); -int softdep_process_worklist(struct mount *, int); int softdep_fsync(struct vnode *); -int softdep_waitidle(struct mount *); int softdep_prealloc(struct vnode *, int); int softdep_journal_lookup(struct mount *, struct vnode **); void softdep_journal_freeblocks(struct inode *, struct ucred *, off_t, int); Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Sun Oct 20 20:10:31 2013 (r256800) +++ head/sys/ufs/ffs/ffs_softdep.c Sun Oct 20 20:41:38 2013 (r256801) @@ -812,6 +812,8 @@ struct jextent { * Internal function prototypes. */ static void softdep_error(char *, int); +static int softdep_process_worklist(struct mount *, int); +static int softdep_waitidle(struct mount *); static void drain_output(struct vnode *); static struct buf *getdirtybuf(struct buf *, struct rwlock *, int); static void clear_remove(void); @@ -926,7 +928,7 @@ static inline void setup_freeindir(struc static inline struct freeblks *newfreeblks(struct mount *, struct inode *); static void freeblks_free(struct ufsmount *, struct freeblks *, int); static void indir_trunc(struct freework *, ufs2_daddr_t, ufs_lbn_t); -ufs2_daddr_t blkcount(struct fs *, ufs2_daddr_t, off_t); +static ufs2_daddr_t blkcount(struct fs *, ufs2_daddr_t, off_t); static int trunc_check_buf(struct buf *, int *, ufs_lbn_t, int, int); static void trunc_dependencies(struct inode *, struct freeblks *, ufs_lbn_t, int, int); @@ -1563,7 +1565,7 @@ wait_worklist(wk, wmesg) * ordering ensures that no new <vfsid, inum, lbn> triples will be generated * until all the old ones have been purged from the dependency lists. */ -int +static int softdep_process_worklist(mp, full) struct mount *mp; int full; @@ -1909,7 +1911,7 @@ softdep_flushworklist(oldmnt, countp, td return (error); } -int +static int softdep_waitidle(struct mount *mp) { struct ufsmount *ump; @@ -6225,7 +6227,7 @@ complete_trunc_indir(freework) * Calculate the number of blocks we are going to release where datablocks * is the current total and length is the new file size. */ -ufs2_daddr_t +static ufs2_daddr_t blkcount(fs, datablocks, length) struct fs *fs; ufs2_daddr_t datablocks;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310202041.r9KKfc3a059692>