Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disallow threshold-initiated cache flush when dirops are active. Also, make 

SET_ENDOP use lfs_check instead of inlining most of it.
This commit is contained in:
perseant 1999-04-12 00:36:47 +00:00
parent a520288478
commit 8d72b3204a
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/ufs/lfs/lfs_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_bio.c,v 1.9 1999/03/25 22:26:52 perseant Exp $ */ /* $NetBSD: lfs_bio.c,v 1.10 1999/04/12 00:36:47 perseant Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -341,7 +341,8 @@ lfs_check(vp, blkno, flags)
int flags; int flags;
{ {
int error; int error;
struct lfs *fs;
error = 0; error = 0;
if (incore(vp, blkno)) if (incore(vp, blkno))
return (0); return (0);
@ -351,10 +352,19 @@ lfs_check(vp, blkno, flags)
if (VTOI(vp)->i_number == LFS_IFILE_INUM) if (VTOI(vp)->i_number == LFS_IFILE_INUM)
return 0; return 0;
/* If dirops are active, can't flush. Wait for SET_ENDOP */
fs = VTOI(vp)->i_lfs;
if (fs->lfs_dirops)
return 0;
if (locked_queue_count > LFS_MAX_BUFS if (locked_queue_count > LFS_MAX_BUFS
|| locked_queue_bytes > LFS_MAX_BYTES) || locked_queue_bytes > LFS_MAX_BYTES
|| fs->lfs_dirvcount > LFS_MAXDIROP)
{ {
lfs_flush(VTOI(vp)->i_lfs, flags); ++fs->lfs_writer;
lfs_flush(fs, flags);
if(--fs->lfs_writer==0)
wakeup(&fs->lfs_dirops);
} }
while (locked_queue_count > LFS_WAIT_BUFS while (locked_queue_count > LFS_WAIT_BUFS
|| locked_queue_bytes > LFS_WAIT_BYTES) || locked_queue_bytes > LFS_WAIT_BYTES)

29
sys/ufs/lfs/lfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vnops.c,v 1.25 1999/03/29 21:54:26 perseant Exp $ */ /* $NetBSD: lfs_vnops.c,v 1.26 1999/04/12 00:36:47 perseant Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -313,16 +313,11 @@ static int lfs_set_dirop(fs)
return 0; return 0;
} }
#define SET_ENDOP(fs,str) { \ #define SET_ENDOP(fs,vp,str) { \
--(fs)->lfs_dirops; \ --(fs)->lfs_dirops; \
if (!(fs)->lfs_dirops) { \ if (!(fs)->lfs_dirops) { \
wakeup(&(fs)->lfs_writer); \ wakeup(&(fs)->lfs_writer); \
if ((fs)->lfs_dirvcount > LFS_MAXDIROP) { \ lfs_check((vp),LFS_UNUSED_LBN,0); \
++(fs)->lfs_writer; \
lfs_flush((fs),0); \
if(--(fs)->lfs_writer==0) \
wakeup(&(fs)->lfs_dirops); \
} \
} \ } \
} }
@ -362,7 +357,7 @@ lfs_symlink(v)
MARK_VNODE(ap->a_dvp); MARK_VNODE(ap->a_dvp);
ret = ufs_symlink(ap); ret = ufs_symlink(ap);
MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */ MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */
SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,"symilnk"); SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"symilnk");
return (ret); return (ret);
} }
@ -383,7 +378,7 @@ lfs_mknod(v)
MARK_VNODE(ap->a_dvp); MARK_VNODE(ap->a_dvp);
ret = ufs_mknod(ap); ret = ufs_mknod(ap);
MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */ MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */
SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,"mknod"); SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"mknod");
return (ret); return (ret);
} }
@ -404,7 +399,7 @@ lfs_create(v)
MARK_VNODE(ap->a_dvp); MARK_VNODE(ap->a_dvp);
ret = ufs_create(ap); ret = ufs_create(ap);
MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */ MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */
SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,"create"); SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"create");
return (ret); return (ret);
} }
@ -423,7 +418,7 @@ lfs_whiteout(v)
return ret; return ret;
MARK_VNODE(ap->a_dvp); MARK_VNODE(ap->a_dvp);
ret = ufs_whiteout(ap); ret = ufs_whiteout(ap);
SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,"whiteout"); SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"whiteout");
return (ret); return (ret);
} }
@ -444,7 +439,7 @@ lfs_mkdir(v)
MARK_VNODE(ap->a_dvp); MARK_VNODE(ap->a_dvp);
ret = ufs_mkdir(ap); ret = ufs_mkdir(ap);
MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */ MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,*(ap->a_vpp)); /* XXX KS */
SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,"mkdir"); SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"mkdir");
return (ret); return (ret);
} }
@ -464,7 +459,7 @@ lfs_remove(v)
MARK_VNODE(ap->a_vp); MARK_VNODE(ap->a_vp);
ret = ufs_remove(ap); ret = ufs_remove(ap);
MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,ap->a_vp); MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,ap->a_vp);
SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,"remove"); SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"remove");
return (ret); return (ret);
} }
@ -486,7 +481,7 @@ lfs_rmdir(v)
MARK_VNODE(ap->a_vp); MARK_VNODE(ap->a_vp);
ret = ufs_rmdir(ap); ret = ufs_rmdir(ap);
MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,ap->a_vp); MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,ap->a_vp);
SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,"rmdir"); SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"rmdir");
return (ret); return (ret);
} }
@ -505,7 +500,7 @@ lfs_link(v)
return ret; return ret;
MARK_VNODE(ap->a_dvp); MARK_VNODE(ap->a_dvp);
ret = ufs_link(ap); ret = ufs_link(ap);
SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,"link"); SET_ENDOP(VTOI(ap->a_dvp)->i_lfs,ap->a_dvp,"link");
return (ret); return (ret);
} }
@ -530,7 +525,7 @@ lfs_rename(v)
ret = ufs_rename(ap); ret = ufs_rename(ap);
MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,ap->a_fvp); MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,ap->a_fvp);
MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,ap->a_tvp); MAYBE_INACTIVE(VTOI(ap->a_dvp)->i_lfs,ap->a_tvp);
SET_ENDOP(VTOI(ap->a_fdvp)->i_lfs,"rename"); SET_ENDOP(VTOI(ap->a_fdvp)->i_lfs,ap->a_fdvp,"rename");
return (ret); return (ret);
} }