Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_vnops.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_vnops.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.77.10.3 retrieving revision 1.86.4.10 diff -u -p -r1.77.10.3 -r1.86.4.10 --- src/sys/ufs/ffs/ffs_vnops.c 2006/05/06 23:32:33 1.77.10.3 +++ src/sys/ufs/ffs/ffs_vnops.c 2007/08/24 23:28:45 1.86.4.10 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_vnops.c,v 1.77.10.3 2006/05/06 23:32:33 christos Exp $ */ +/* $NetBSD: ffs_vnops.c,v 1.86.4.10 2007/08/24 23:28:45 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.77.10.3 2006/05/06 23:32:33 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.86.4.10 2007/08/24 23:28:45 ad Exp $"); #include #include @@ -48,6 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c, #include #include #include +#include #include #include @@ -100,16 +101,16 @@ const struct vnodeopv_entry_desc ffs_vno { &vop_abortop_desc, ufs_abortop }, /* abortop */ { &vop_inactive_desc, ufs_inactive }, /* inactive */ { &vop_reclaim_desc, ffs_reclaim }, /* reclaim */ - { &vop_lock_desc, ufs_lock }, /* lock */ - { &vop_unlock_desc, ufs_unlock }, /* unlock */ + { &vop_lock_desc, ffs_lock }, /* lock */ + { &vop_unlock_desc, ffs_unlock }, /* unlock */ { &vop_bmap_desc, ufs_bmap }, /* bmap */ { &vop_strategy_desc, ufs_strategy }, /* strategy */ { &vop_print_desc, ufs_print }, /* print */ - { &vop_islocked_desc, ufs_islocked }, /* islocked */ + { &vop_islocked_desc, ffs_islocked }, /* islocked */ { &vop_pathconf_desc, ufs_pathconf }, /* pathconf */ { &vop_advlock_desc, ufs_advlock }, /* advlock */ { &vop_bwrite_desc, vn_bwrite }, /* bwrite */ - { &vop_getpages_desc, ffs_getpages }, /* getpages */ + { &vop_getpages_desc, genfs_getpages }, /* getpages */ { &vop_putpages_desc, genfs_putpages }, /* putpages */ { &vop_openextattr_desc, ffs_openextattr }, /* openextattr */ { &vop_closeextattr_desc, ffs_closeextattr }, /* closeextattr */ @@ -155,12 +156,12 @@ const struct vnodeopv_entry_desc ffs_spe { &vop_abortop_desc, spec_abortop }, /* abortop */ { &vop_inactive_desc, ufs_inactive }, /* inactive */ { &vop_reclaim_desc, ffs_reclaim }, /* reclaim */ - { &vop_lock_desc, ufs_lock }, /* lock */ - { &vop_unlock_desc, ufs_unlock }, /* unlock */ + { &vop_lock_desc, ffs_lock }, /* lock */ + { &vop_unlock_desc, ffs_unlock }, /* unlock */ { &vop_bmap_desc, spec_bmap }, /* bmap */ { &vop_strategy_desc, spec_strategy }, /* strategy */ { &vop_print_desc, ufs_print }, /* print */ - { &vop_islocked_desc, ufs_islocked }, /* islocked */ + { &vop_islocked_desc, ffs_islocked }, /* islocked */ { &vop_pathconf_desc, spec_pathconf }, /* pathconf */ { &vop_advlock_desc, spec_advlock }, /* advlock */ { &vop_bwrite_desc, vn_bwrite }, /* bwrite */ @@ -210,12 +211,12 @@ const struct vnodeopv_entry_desc ffs_fif { &vop_abortop_desc, fifo_abortop }, /* abortop */ { &vop_inactive_desc, ufs_inactive }, /* inactive */ { &vop_reclaim_desc, ffs_reclaim }, /* reclaim */ - { &vop_lock_desc, ufs_lock }, /* lock */ - { &vop_unlock_desc, ufs_unlock }, /* unlock */ + { &vop_lock_desc, ffs_lock }, /* lock */ + { &vop_unlock_desc, ffs_unlock }, /* unlock */ { &vop_bmap_desc, fifo_bmap }, /* bmap */ { &vop_strategy_desc, fifo_strategy }, /* strategy */ { &vop_print_desc, ufs_print }, /* print */ - { &vop_islocked_desc, ufs_islocked }, /* islocked */ + { &vop_islocked_desc, ffs_islocked }, /* islocked */ { &vop_pathconf_desc, fifo_pathconf }, /* pathconf */ { &vop_advlock_desc, fifo_advlock }, /* advlock */ { &vop_bwrite_desc, vn_bwrite }, /* bwrite */ @@ -245,22 +246,25 @@ ffs_fsync(void *v) struct lwp *a_l; } */ *ap = v; struct buf *bp; - int s, num, error, i; + int num, error, i; struct indir ia[NIADDR + 1]; int bsize; daddr_t blk_high; struct vnode *vp; + vp = ap->a_vp; + + fstrans_start(vp->v_mount, FSTRANS_LAZY); /* * XXX no easy way to sync a range in a file with softdep. */ - if ((ap->a_offlo == 0 && ap->a_offhi == 0) || DOINGSOFTDEP(ap->a_vp) || - (ap->a_vp->v_type != VREG)) - return ffs_full_fsync(v); - - vp = ap->a_vp; + if ((ap->a_offlo == 0 && ap->a_offhi == 0) || DOINGSOFTDEP(vp) || + (vp->v_type != VREG)) { + error = ffs_full_fsync(v); + goto out; + } - bsize = ap->a_vp->v_mount->mnt_stat.f_iosize; + bsize = vp->v_mount->mnt_stat.f_iosize; blk_high = ap->a_offhi / bsize; if (ap->a_offhi % bsize != 0) blk_high++; @@ -269,52 +273,44 @@ ffs_fsync(void *v) * First, flush all pages in range. */ - simple_lock(&vp->v_interlock); + mutex_enter(&vp->v_interlock); error = VOP_PUTPAGES(vp, trunc_page(ap->a_offlo), round_page(ap->a_offhi), PGO_CLEANIT | ((ap->a_flags & FSYNC_WAIT) ? PGO_SYNCIO : 0)); if (error) { - return error; + goto out; } /* * Then, flush indirect blocks. */ - s = splbio(); if (blk_high >= NDADDR) { error = ufs_getlbns(vp, blk_high, ia, &num); - if (error) { - splx(s); - return error; - } + if (error) + goto out; + + mutex_enter(&bufcache_lock); for (i = 0; i < num; i++) { - bp = incore(vp, ia[i].in_lbn); - if (bp != NULL) { - simple_lock(&bp->b_interlock); - if (!(bp->b_flags & B_BUSY) && (bp->b_flags & B_DELWRI)) { - bp->b_flags |= B_BUSY | B_VFLUSH; - simple_unlock(&bp->b_interlock); - splx(s); - bawrite(bp); - s = splbio(); - } else { - simple_unlock(&bp->b_interlock); - } - } + if ((bp = incore(vp, ia[i].in_lbn)) == NULL) + continue; + if ((bp->b_cflags & BC_BUSY) != 0 || + (bp->b_oflags & BO_DELWRI) == 0) + continue; + bp->b_cflags |= BC_BUSY | BC_VFLUSH; + mutex_exit(&bufcache_lock); + bawrite(bp); + mutex_enter(&bufcache_lock); } + mutex_exit(&bufcache_lock); } if (ap->a_flags & FSYNC_WAIT) { - simple_lock(&global_v_numoutput_slock); - while (vp->v_numoutput > 0) { - vp->v_flag |= VBWAIT; - ltsleep(&vp->v_numoutput, PRIBIO + 1, "fsync_range", 0, - &global_v_numoutput_slock); - } - simple_unlock(&global_v_numoutput_slock); + mutex_enter(&vp->v_interlock); + while (vp->v_numoutput > 0) + cv_wait(&vp->v_cv, &vp->v_interlock); + mutex_exit(&vp->v_interlock); } - splx(s); error = ffs_update(vp, NULL, NULL, ((ap->a_flags & (FSYNC_WAIT | FSYNC_DATAONLY)) == FSYNC_WAIT) @@ -323,9 +319,11 @@ ffs_fsync(void *v) if (error == 0 && ap->a_flags & FSYNC_CACHE) { int l = 0; VOP_IOCTL(VTOI(vp)->i_devvp, DIOCCACHESYNC, &l, FWRITE, - ap->a_l->l_proc->p_cred, ap->a_l); + ap->a_l->l_cred, ap->a_l); } +out: + fstrans_done(vp->v_mount); return error; } @@ -346,54 +344,55 @@ ffs_full_fsync(void *v) } */ *ap = v; struct vnode *vp = ap->a_vp; struct buf *bp, *nbp; - int s, error, passes, skipmeta, inodedeps_only, waitfor; + int error, passes, skipmeta, inodedeps_only, waitfor; if (vp->v_type == VBLK && vp->v_specmountpoint != NULL && (vp->v_specmountpoint->mnt_flag & MNT_SOFTDEP)) softdep_fsync_mountdev(vp); + mutex_enter(&vp->v_interlock); + inodedeps_only = DOINGSOFTDEP(vp) && (ap->a_flags & FSYNC_RECLAIM) - && vp->v_uobj.uo_npages == 0 && LIST_EMPTY(&vp->v_dirtyblkhd); + && UVM_OBJ_IS_CLEAN(&vp->v_uobj) && LIST_EMPTY(&vp->v_dirtyblkhd); /* * Flush all dirty data associated with a vnode. */ if (vp->v_type == VREG || vp->v_type == VBLK) { - simple_lock(&vp->v_interlock); error = VOP_PUTPAGES(vp, 0, 0, PGO_ALLPAGES | PGO_CLEANIT | - ((ap->a_flags & FSYNC_WAIT) ? PGO_SYNCIO : 0)); + ((ap->a_flags & FSYNC_WAIT) ? PGO_SYNCIO : 0) | + (fstrans_getstate(vp->v_mount) == FSTRANS_SUSPENDING ? + PGO_FREE : 0)); if (error) { return error; } - } + } else + mutex_exit(&vp->v_interlock); passes = NIADDR + 1; skipmeta = 0; if (ap->a_flags & FSYNC_WAIT) skipmeta = 1; - s = splbio(); + mutex_enter(&bufcache_lock); + mutex_enter(&vp->v_interlock); loop: - LIST_FOREACH(bp, &vp->v_dirtyblkhd, b_vnbufs) - bp->b_flags &= ~B_SCANNED; + LIST_FOREACH(bp, &vp->v_dirtyblkhd, b_vnbufs) { + bp->b_cflags &= ~BC_SCANNED; + } for (bp = LIST_FIRST(&vp->v_dirtyblkhd); bp; bp = nbp) { nbp = LIST_NEXT(bp, b_vnbufs); - simple_lock(&bp->b_interlock); - if (bp->b_flags & (B_BUSY | B_SCANNED)) { - simple_unlock(&bp->b_interlock); + if (bp->b_cflags & (BC_BUSY | BC_SCANNED)) continue; - } - if ((bp->b_flags & B_DELWRI) == 0) + if ((bp->b_oflags & BO_DELWRI) == 0) panic("ffs_fsync: not dirty"); - if (skipmeta && bp->b_lblkno < 0) { - simple_unlock(&bp->b_interlock); + if (skipmeta && bp->b_lblkno < 0) continue; - } - simple_unlock(&bp->b_interlock); - bp->b_flags |= B_BUSY | B_VFLUSH | B_SCANNED; - splx(s); + mutex_exit(&vp->v_interlock); + bp->b_cflags |= BC_BUSY | BC_VFLUSH | BC_SCANNED; + mutex_exit(&bufcache_lock); /* * On our final pass through, do all I/O synchronously * so that we can find out if our flush is failing @@ -403,26 +402,25 @@ loop: (void) bawrite(bp); else if ((error = bwrite(bp)) != 0) return (error); - s = splbio(); /* - * Since we may have slept during the I/O, we need + * Since we unlocked during the I/O, we need * to start from a known point. */ + mutex_enter(&bufcache_lock); + mutex_enter(&vp->v_interlock); nbp = LIST_FIRST(&vp->v_dirtyblkhd); } if (skipmeta) { skipmeta = 0; goto loop; } + mutex_exit(&bufcache_lock); + if (ap->a_flags & FSYNC_WAIT) { - simple_lock(&global_v_numoutput_slock); while (vp->v_numoutput) { - vp->v_flag |= VBWAIT; - (void) ltsleep(&vp->v_numoutput, PRIBIO + 1, - "ffsfsync", 0, &global_v_numoutput_slock); + cv_wait(&vp->v_cv, &vp->v_interlock); } - simple_unlock(&global_v_numoutput_slock); - splx(s); + mutex_exit(&vp->v_interlock); /* * Ensure that any filesystem metadata associated @@ -431,7 +429,6 @@ loop: if ((error = softdep_sync_metadata(ap)) != 0) return (error); - s = splbio(); if (!LIST_EMPTY(&vp->v_dirtyblkhd)) { /* * Block devices associated with filesystems may @@ -450,8 +447,8 @@ loop: vprint("ffs_fsync: dirty", vp); #endif } - } - splx(s); + } else + mutex_exit(&vp->v_interlock); if (inodedeps_only) waitfor = 0; @@ -462,7 +459,7 @@ loop: if (error == 0 && ap->a_flags & FSYNC_CACHE) { int i = 0; VOP_IOCTL(VTOI(vp)->i_devvp, DIOCCACHESYNC, &i, FWRITE, - ap->a_l->l_proc->p_cred, ap->a_l); + ap->a_l->l_cred, ap->a_l); } return error; @@ -480,11 +477,16 @@ ffs_reclaim(void *v) } */ *ap = v; struct vnode *vp = ap->a_vp; struct inode *ip = VTOI(vp); + struct mount *mp = vp->v_mount; struct ufsmount *ump = ip->i_ump; + void *data; int error; - if ((error = ufs_reclaim(vp, ap->a_l)) != 0) + fstrans_start(mp, FSTRANS_LAZY); + if ((error = ufs_reclaim(vp, ap->a_l)) != 0) { + fstrans_done(mp); return (error); + } if (ip->i_din.ffs1_din != NULL) { if (ump->um_fstype == UFS1) pool_put(&ffs_dinode1_pool, ip->i_din.ffs1_din); @@ -492,14 +494,24 @@ ffs_reclaim(void *v) pool_put(&ffs_dinode2_pool, ip->i_din.ffs2_din); } /* + * To interlock with ffs_sync(). + */ + genfs_node_destroy(vp); + mutex_enter(&vp->v_interlock); + data = vp->v_data; + vp->v_data = NULL; + mutex_exit(&vp->v_interlock); + + /* * XXX MFS ends up here, too, to free an inode. Should we create * XXX a separate pool for MFS inodes? */ - pool_put(&ffs_inode_pool, vp->v_data); - vp->v_data = NULL; + pool_put(&ffs_inode_pool, data); + fstrans_done(mp); return (0); } +#if 0 int ffs_getpages(void *v) { @@ -528,12 +540,13 @@ ffs_getpages(void *v) blkoff(fs, *ap->a_count << PAGE_SHIFT) != 0) && DOINGSOFTDEP(ap->a_vp)) { if ((ap->a_flags & PGO_LOCKED) == 0) { - simple_unlock(&vp->v_interlock); + mutex_exit(&vp->v_interlock); } return EINVAL; } return genfs_getpages(v); } +#endif /* * Return the last logical file offset that should be written for this file @@ -607,12 +620,18 @@ ffs_getextattr(void *v) kauth_cred_t a_cred; struct proc *a_p; } */ *ap = v; - struct inode *ip = VTOI(ap->a_vp); + struct vnode *vp = ap->a_vp; + struct inode *ip = VTOI(vp); struct fs *fs = ip->i_fs; if (fs->fs_magic == FS_UFS1_MAGIC) { #ifdef UFS_EXTATTR - return (ufs_getextattr(ap)); + int error; + + fstrans_start(vp->v_mount, FSTRANS_SHARED); + error = ufs_getextattr(ap); + fstrans_done(vp->v_mount); + return error; #else return (EOPNOTSUPP); #endif @@ -633,12 +652,18 @@ ffs_setextattr(void *v) kauth_cred_t a_cred; struct proc *a_p; } */ *ap = v; - struct inode *ip = VTOI(ap->a_vp); + struct vnode *vp = ap->a_vp; + struct inode *ip = VTOI(vp); struct fs *fs = ip->i_fs; if (fs->fs_magic == FS_UFS1_MAGIC) { #ifdef UFS_EXTATTR - return (ufs_setextattr(ap)); + int error; + + fstrans_start(vp->v_mount, FSTRANS_SHARED); + error = ufs_setextattr(ap); + fstrans_done(vp->v_mount); + return error; #else return (EOPNOTSUPP); #endif @@ -679,12 +704,18 @@ ffs_deleteextattr(void *v) kauth_cred_t a_cred; struct proc *a_p; } */ *ap = v; - struct inode *ip = VTOI(ap->a_vp); + struct vnode *vp = ap->a_vp; + struct inode *ip = VTOI(vp); struct fs *fs = ip->i_fs; if (fs->fs_magic == FS_UFS1_MAGIC) { #ifdef UFS_EXTATTR - return (ufs_deleteextattr(ap)); + int error; + + fstrans_start(vp->v_mount, FSTRANS_SHARED); + error = ufs_deleteextattr(ap); + fstrans_done(vp->v_mount); + return error; #else return (EOPNOTSUPP); #endif @@ -693,3 +724,70 @@ ffs_deleteextattr(void *v) /* XXX Not implemented for UFS2 file systems. */ return (EOPNOTSUPP); } + +/* + * Lock the node. + */ +int +ffs_lock(void *v) +{ + struct vop_lock_args /* { + struct vnode *a_vp; + int a_flags; + } */ *ap = v; + struct vnode *vp = ap->a_vp; + struct mount *mp = vp->v_mount; + + /* + * Fake lock during file system suspension. + */ + if ((vp->v_type == VREG || vp->v_type == VDIR) && + fstrans_is_owner(mp) && + fstrans_getstate(mp) == FSTRANS_SUSPENDING) { + if ((ap->a_flags & LK_INTERLOCK) != 0) + mutex_exit(&vp->v_interlock); + return 0; + } + return (lockmgr(vp->v_vnlock, ap->a_flags, &vp->v_interlock)); +} + +/* + * Unlock the node. + */ +int +ffs_unlock(void *v) +{ + struct vop_unlock_args /* { + struct vnode *a_vp; + int a_flags; + } */ *ap = v; + struct vnode *vp = ap->a_vp; + struct mount *mp = vp->v_mount; + + /* + * Fake unlock during file system suspension. + */ + if ((vp->v_type == VREG || vp->v_type == VDIR) && + fstrans_is_owner(mp) && + fstrans_getstate(mp) == FSTRANS_SUSPENDING) { + if ((ap->a_flags & LK_INTERLOCK) != 0) + mutex_exit(&vp->v_interlock); + return 0; + } + return (lockmgr(vp->v_vnlock, ap->a_flags | LK_RELEASE, + &vp->v_interlock)); +} + +/* + * Return whether or not the node is locked. + */ +int +ffs_islocked(void *v) +{ + struct vop_islocked_args /* { + struct vnode *a_vp; + } */ *ap = v; + struct vnode *vp = ap->a_vp; + + return (lockstatus(vp->v_vnlock)); +}