X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..2d21ac55c334faf3a56e5634905ed6987fc787d4:/bsd/ufs/ffs/ffs_vnops.c diff --git a/bsd/ufs/ffs/ffs_vnops.c b/bsd/ufs/ffs/ffs_vnops.c index b095c6dd2..9120f2831 100644 --- a/bsd/ufs/ffs/ffs_vnops.c +++ b/bsd/ufs/ffs/ffs_vnops.c @@ -1,16 +1,19 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ - * - * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * * This file contains Original Code and/or Modifications of Original Code * as defined in and that are subject to the Apple Public Source License * Version 2.0 (the 'License'). You may not use this file except in - * compliance with the License. Please obtain a copy of the License at - * http://www.opensource.apple.com/apsl/ and read it before using this - * file. + * compliance with the License. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * unlawful or unlicensed copies of an Apple operating system, or to + * circumvent, violate, or enable the circumvention or violation of, any + * terms of an Apple operating system software license agreement. + * + * Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this file. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER @@ -20,7 +23,7 @@ * Please see the License for the specific language governing rights and * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */ /* @@ -65,11 +68,10 @@ #include #include #include -#include #include #include -#include -#include +#include +#include #include #include #include @@ -80,7 +82,6 @@ #include #include -#include #include #include #include @@ -91,7 +92,6 @@ #include #if REV_ENDIAN_FS #include -#include #endif /* REV_ENDIAN_FS */ #define VOPFUNC int (*)(void *) @@ -99,57 +99,43 @@ /* Global vfs data structures for ufs. */ int (**ffs_vnodeop_p)(void *); struct vnodeopv_entry_desc ffs_vnodeop_entries[] = { - { &vop_default_desc, (VOPFUNC)vn_default_error }, - { &vop_lookup_desc, (VOPFUNC)ufs_lookup }, /* lookup */ - { &vop_create_desc, (VOPFUNC)ufs_create }, /* create */ - { &vop_whiteout_desc, (VOPFUNC)ufs_whiteout }, /* whiteout */ - { &vop_mknod_desc, (VOPFUNC)ufs_mknod }, /* mknod */ - { &vop_open_desc, (VOPFUNC)ufs_open }, /* open */ - { &vop_close_desc, (VOPFUNC)ufs_close }, /* close */ - { &vop_access_desc, (VOPFUNC)ufs_access }, /* access */ - { &vop_getattr_desc, (VOPFUNC)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (VOPFUNC)ufs_setattr }, /* setattr */ - { &vop_read_desc, (VOPFUNC)ffs_read }, /* read */ - { &vop_write_desc, (VOPFUNC)ffs_write }, /* write */ - { &vop_lease_desc, (VOPFUNC)ufs_lease_check }, /* lease */ - { &vop_ioctl_desc, (VOPFUNC)ufs_ioctl }, /* ioctl */ - { &vop_select_desc, (VOPFUNC)ufs_select }, /* select */ - { &vop_revoke_desc, (VOPFUNC)ufs_revoke }, /* revoke */ - { &vop_mmap_desc, (VOPFUNC)ufs_mmap }, /* mmap */ - { &vop_fsync_desc, (VOPFUNC)ffs_fsync }, /* fsync */ - { &vop_seek_desc, (VOPFUNC)ufs_seek }, /* seek */ - { &vop_remove_desc, (VOPFUNC)ufs_remove }, /* remove */ - { &vop_link_desc, (VOPFUNC)ufs_link }, /* link */ - { &vop_rename_desc, (VOPFUNC)ufs_rename }, /* rename */ - { &vop_mkdir_desc, (VOPFUNC)ufs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (VOPFUNC)ufs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (VOPFUNC)ufs_symlink }, /* symlink */ - { &vop_readdir_desc, (VOPFUNC)ufs_readdir }, /* readdir */ - { &vop_readlink_desc, (VOPFUNC)ufs_readlink }, /* readlink */ - { &vop_abortop_desc, (VOPFUNC)ufs_abortop }, /* abortop */ - { &vop_inactive_desc, (VOPFUNC)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (VOPFUNC)ffs_reclaim }, /* reclaim */ - { &vop_lock_desc, (VOPFUNC)ufs_lock }, /* lock */ - { &vop_unlock_desc, (VOPFUNC)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (VOPFUNC)ufs_bmap }, /* bmap */ - { &vop_strategy_desc, (VOPFUNC)ufs_strategy }, /* strategy */ - { &vop_print_desc, (VOPFUNC)ufs_print }, /* print */ - { &vop_islocked_desc, (VOPFUNC)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (VOPFUNC)ufs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (VOPFUNC)ufs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (VOPFUNC)ffs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (VOPFUNC)ffs_valloc }, /* valloc */ - { &vop_reallocblks_desc, (VOPFUNC)ffs_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (VOPFUNC)ffs_vfree }, /* vfree */ - { &vop_truncate_desc, (VOPFUNC)ffs_truncate }, /* truncate */ - { &vop_update_desc, (VOPFUNC)ffs_update }, /* update */ - { &vop_bwrite_desc, (VOPFUNC)vn_bwrite }, - { &vop_pagein_desc, (VOPFUNC)ffs_pagein }, /* Pagein */ - { &vop_pageout_desc, (VOPFUNC)ffs_pageout }, /* Pageout */ - { &vop_copyfile_desc, (VOPFUNC)err_copyfile }, /* Copy File */ - { &vop_blktooff_desc, (VOPFUNC)ffs_blktooff }, /* blktooff */ - { &vop_offtoblk_desc, (VOPFUNC)ffs_offtoblk }, /* offtoblk */ - { &vop_cmap_desc, (VOPFUNC)ufs_cmap }, /* cmap */ + { &vnop_default_desc, (VOPFUNC)vn_default_error }, + { &vnop_lookup_desc, (VOPFUNC)ufs_lookup }, /* lookup */ + { &vnop_create_desc, (VOPFUNC)ufs_create }, /* create */ + { &vnop_whiteout_desc, (VOPFUNC)ufs_whiteout }, /* whiteout */ + { &vnop_mknod_desc, (VOPFUNC)ufs_mknod }, /* mknod */ + { &vnop_open_desc, (VOPFUNC)ufs_open }, /* open */ + { &vnop_close_desc, (VOPFUNC)ufs_close }, /* close */ + { &vnop_getattr_desc, (VOPFUNC)ufs_getattr }, /* getattr */ + { &vnop_setattr_desc, (VOPFUNC)ufs_setattr }, /* setattr */ + { &vnop_read_desc, (VOPFUNC)ffs_read }, /* read */ + { &vnop_write_desc, (VOPFUNC)ffs_write }, /* write */ + { &vnop_ioctl_desc, (VOPFUNC)ufs_ioctl }, /* ioctl */ + { &vnop_select_desc, (VOPFUNC)ufs_select }, /* select */ + { &vnop_revoke_desc, (VOPFUNC)ufs_revoke }, /* revoke */ + { &vnop_mmap_desc, (VOPFUNC)ufs_mmap }, /* mmap */ + { &vnop_fsync_desc, (VOPFUNC)ffs_fsync }, /* fsync */ + { &vnop_remove_desc, (VOPFUNC)ufs_remove }, /* remove */ + { &vnop_link_desc, (VOPFUNC)ufs_link }, /* link */ + { &vnop_rename_desc, (VOPFUNC)ufs_rename }, /* rename */ + { &vnop_mkdir_desc, (VOPFUNC)ufs_mkdir }, /* mkdir */ + { &vnop_rmdir_desc, (VOPFUNC)ufs_rmdir }, /* rmdir */ + { &vnop_symlink_desc, (VOPFUNC)ufs_symlink }, /* symlink */ + { &vnop_readdir_desc, (VOPFUNC)ufs_readdir }, /* readdir */ + { &vnop_readlink_desc, (VOPFUNC)ufs_readlink }, /* readlink */ + { &vnop_inactive_desc, (VOPFUNC)ufs_inactive }, /* inactive */ + { &vnop_reclaim_desc, (VOPFUNC)ffs_reclaim }, /* reclaim */ + { &vnop_strategy_desc, (VOPFUNC)ufs_strategy }, /* strategy */ + { &vnop_pathconf_desc, (VOPFUNC)ufs_pathconf }, /* pathconf */ + { &vnop_advlock_desc, (VOPFUNC)err_advlock }, /* advlock */ + { &vnop_bwrite_desc, (VOPFUNC)vn_bwrite }, + { &vnop_pagein_desc, (VOPFUNC)ffs_pagein }, /* Pagein */ + { &vnop_pageout_desc, (VOPFUNC)ffs_pageout }, /* Pageout */ + { &vnop_copyfile_desc, (VOPFUNC)err_copyfile }, /* Copy File */ + { &vnop_blktooff_desc, (VOPFUNC)ffs_blktooff }, /* blktooff */ + { &vnop_offtoblk_desc, (VOPFUNC)ffs_offtoblk }, /* offtoblk */ + { &vnop_blockmap_desc, (VOPFUNC)ufs_blockmap }, /* blockmap */ + { &vnop_kqfilt_add_desc, (VOPFUNC)ufs_kqfilt_add }, /* kqfilt_add */ { (struct vnodeop_desc*)NULL, (int(*)())NULL } }; struct vnodeopv_desc ffs_vnodeop_opv_desc = @@ -157,57 +143,41 @@ struct vnodeopv_desc ffs_vnodeop_opv_desc = int (**ffs_specop_p)(void *); struct vnodeopv_entry_desc ffs_specop_entries[] = { - { &vop_default_desc, (VOPFUNC)vn_default_error }, - { &vop_lookup_desc, (VOPFUNC)spec_lookup }, /* lookup */ - { &vop_create_desc, (VOPFUNC)spec_create }, /* create */ - { &vop_mknod_desc, (VOPFUNC)spec_mknod }, /* mknod */ - { &vop_open_desc, (VOPFUNC)spec_open }, /* open */ - { &vop_close_desc, (VOPFUNC)ufsspec_close }, /* close */ - { &vop_access_desc, (VOPFUNC)ufs_access }, /* access */ - { &vop_getattr_desc, (VOPFUNC)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (VOPFUNC)ufs_setattr }, /* setattr */ - { &vop_read_desc, (VOPFUNC)ufsspec_read }, /* read */ - { &vop_write_desc, (VOPFUNC)ufsspec_write }, /* write */ - { &vop_lease_desc, (VOPFUNC)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (VOPFUNC)spec_ioctl }, /* ioctl */ - { &vop_select_desc, (VOPFUNC)spec_select }, /* select */ - { &vop_revoke_desc, (VOPFUNC)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (VOPFUNC)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (VOPFUNC)ffs_fsync }, /* fsync */ - { &vop_seek_desc, (VOPFUNC)spec_seek }, /* seek */ - { &vop_remove_desc, (VOPFUNC)spec_remove }, /* remove */ - { &vop_link_desc, (VOPFUNC)spec_link }, /* link */ - { &vop_rename_desc, (VOPFUNC)spec_rename }, /* rename */ - { &vop_mkdir_desc, (VOPFUNC)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (VOPFUNC)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (VOPFUNC)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (VOPFUNC)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (VOPFUNC)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (VOPFUNC)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (VOPFUNC)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (VOPFUNC)ffs_reclaim }, /* reclaim */ - { &vop_lock_desc, (VOPFUNC)ufs_lock }, /* lock */ - { &vop_unlock_desc, (VOPFUNC)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (VOPFUNC)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (VOPFUNC)spec_strategy }, /* strategy */ - { &vop_print_desc, (VOPFUNC)ufs_print }, /* print */ - { &vop_islocked_desc, (VOPFUNC)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (VOPFUNC)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (VOPFUNC)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (VOPFUNC)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (VOPFUNC)spec_valloc }, /* valloc */ - { &vop_reallocblks_desc, (VOPFUNC)spec_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (VOPFUNC)ffs_vfree }, /* vfree */ - { &vop_truncate_desc, (VOPFUNC)spec_truncate }, /* truncate */ - { &vop_update_desc, (VOPFUNC)ffs_update }, /* update */ - { &vop_bwrite_desc, (VOPFUNC)vn_bwrite }, - { &vop_devblocksize_desc, (VOPFUNC)spec_devblocksize }, /* devblocksize */ - { &vop_pagein_desc, (VOPFUNC)ffs_pagein }, /* Pagein */ - { &vop_pageout_desc, (VOPFUNC)ffs_pageout }, /* Pageout */ - { &vop_copyfile_desc, (VOPFUNC)err_copyfile }, /* Copy File */ - { &vop_blktooff_desc, (VOPFUNC)ffs_blktooff }, /* blktooff */ - { &vop_offtoblk_desc, (VOPFUNC)ffs_offtoblk }, /* offtoblk */ - { &vop_cmap_desc, (VOPFUNC)spec_cmap }, /* cmap */ + { &vnop_default_desc, (VOPFUNC)vn_default_error }, + { &vnop_lookup_desc, (VOPFUNC)spec_lookup }, /* lookup */ + { &vnop_create_desc, (VOPFUNC)spec_create }, /* create */ + { &vnop_mknod_desc, (VOPFUNC)spec_mknod }, /* mknod */ + { &vnop_open_desc, (VOPFUNC)spec_open }, /* open */ + { &vnop_close_desc, (VOPFUNC)ufsspec_close }, /* close */ + { &vnop_getattr_desc, (VOPFUNC)ufs_getattr }, /* getattr */ + { &vnop_setattr_desc, (VOPFUNC)ufs_setattr }, /* setattr */ + { &vnop_read_desc, (VOPFUNC)ufsspec_read }, /* read */ + { &vnop_write_desc, (VOPFUNC)ufsspec_write }, /* write */ + { &vnop_ioctl_desc, (VOPFUNC)spec_ioctl }, /* ioctl */ + { &vnop_select_desc, (VOPFUNC)spec_select }, /* select */ + { &vnop_revoke_desc, (VOPFUNC)spec_revoke }, /* revoke */ + { &vnop_mmap_desc, (VOPFUNC)spec_mmap }, /* mmap */ + { &vnop_fsync_desc, (VOPFUNC)ffs_fsync }, /* fsync */ + { &vnop_remove_desc, (VOPFUNC)spec_remove }, /* remove */ + { &vnop_link_desc, (VOPFUNC)spec_link }, /* link */ + { &vnop_rename_desc, (VOPFUNC)spec_rename }, /* rename */ + { &vnop_mkdir_desc, (VOPFUNC)spec_mkdir }, /* mkdir */ + { &vnop_rmdir_desc, (VOPFUNC)spec_rmdir }, /* rmdir */ + { &vnop_symlink_desc, (VOPFUNC)spec_symlink }, /* symlink */ + { &vnop_readdir_desc, (VOPFUNC)spec_readdir }, /* readdir */ + { &vnop_readlink_desc, (VOPFUNC)spec_readlink }, /* readlink */ + { &vnop_inactive_desc, (VOPFUNC)ufs_inactive }, /* inactive */ + { &vnop_reclaim_desc, (VOPFUNC)ffs_reclaim }, /* reclaim */ + { &vnop_strategy_desc, (VOPFUNC)spec_strategy }, /* strategy */ + { &vnop_pathconf_desc, (VOPFUNC)spec_pathconf }, /* pathconf */ + { &vnop_advlock_desc, (VOPFUNC)err_advlock }, /* advlock */ + { &vnop_bwrite_desc, (VOPFUNC)vn_bwrite }, + { &vnop_pagein_desc, (VOPFUNC)ffs_pagein }, /* Pagein */ + { &vnop_pageout_desc, (VOPFUNC)ffs_pageout }, /* Pageout */ + { &vnop_copyfile_desc, (VOPFUNC)err_copyfile }, /* Copy File */ + { &vnop_blktooff_desc, (VOPFUNC)ffs_blktooff }, /* blktooff */ + { &vnop_offtoblk_desc, (VOPFUNC)ffs_offtoblk }, /* offtoblk */ + { &vnop_blockmap_desc, (VOPFUNC)spec_blockmap }, /* blockmap */ { (struct vnodeop_desc*)NULL, (int(*)())NULL } }; struct vnodeopv_desc ffs_specop_opv_desc = @@ -216,56 +186,42 @@ struct vnodeopv_desc ffs_specop_opv_desc = #if FIFO int (**ffs_fifoop_p)(void *); struct vnodeopv_entry_desc ffs_fifoop_entries[] = { - { &vop_default_desc, (VOPFUNC)vn_default_error }, - { &vop_lookup_desc, (VOPFUNC)fifo_lookup }, /* lookup */ - { &vop_create_desc, (VOPFUNC)fifo_create }, /* create */ - { &vop_mknod_desc, (VOPFUNC)fifo_mknod }, /* mknod */ - { &vop_open_desc, (VOPFUNC)fifo_open }, /* open */ - { &vop_close_desc, (VOPFUNC)ufsfifo_close }, /* close */ - { &vop_access_desc, (VOPFUNC)ufs_access }, /* access */ - { &vop_getattr_desc, (VOPFUNC)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (VOPFUNC)ufs_setattr }, /* setattr */ - { &vop_read_desc, (VOPFUNC)ufsfifo_read }, /* read */ - { &vop_write_desc, (VOPFUNC)ufsfifo_write }, /* write */ - { &vop_lease_desc, (VOPFUNC)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (VOPFUNC)fifo_ioctl }, /* ioctl */ - { &vop_select_desc, (VOPFUNC)fifo_select }, /* select */ - { &vop_revoke_desc, (VOPFUNC)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (VOPFUNC)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (VOPFUNC)ffs_fsync }, /* fsync */ - { &vop_seek_desc, (VOPFUNC)fifo_seek }, /* seek */ - { &vop_remove_desc, (VOPFUNC)fifo_remove }, /* remove */ - { &vop_link_desc, (VOPFUNC)fifo_link }, /* link */ - { &vop_rename_desc, (VOPFUNC)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (VOPFUNC)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (VOPFUNC)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (VOPFUNC)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (VOPFUNC)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (VOPFUNC)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (VOPFUNC)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (VOPFUNC)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (VOPFUNC)ffs_reclaim }, /* reclaim */ - { &vop_lock_desc, (VOPFUNC)ufs_lock }, /* lock */ - { &vop_unlock_desc, (VOPFUNC)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (VOPFUNC)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (VOPFUNC)fifo_strategy }, /* strategy */ - { &vop_print_desc, (VOPFUNC)ufs_print }, /* print */ - { &vop_islocked_desc, (VOPFUNC)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (VOPFUNC)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (VOPFUNC)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (VOPFUNC)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (VOPFUNC)fifo_valloc }, /* valloc */ - { &vop_reallocblks_desc, (VOPFUNC)fifo_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (VOPFUNC)ffs_vfree }, /* vfree */ - { &vop_truncate_desc, (VOPFUNC)fifo_truncate }, /* truncate */ - { &vop_update_desc, (VOPFUNC)ffs_update }, /* update */ - { &vop_bwrite_desc, (VOPFUNC)vn_bwrite }, - { &vop_pagein_desc, (VOPFUNC)ffs_pagein }, /* Pagein */ - { &vop_pageout_desc, (VOPFUNC)ffs_pageout }, /* Pageout */ - { &vop_copyfile_desc, (VOPFUNC)err_copyfile }, /* Copy File */ - { &vop_blktooff_desc, (VOPFUNC)ffs_blktooff }, /* blktooff */ - { &vop_offtoblk_desc, (VOPFUNC)ffs_offtoblk }, /* offtoblk */ - { &vop_cmap_desc, (VOPFUNC)ufs_cmap }, /* cmap */ + { &vnop_default_desc, (VOPFUNC)vn_default_error }, + { &vnop_lookup_desc, (VOPFUNC)fifo_lookup }, /* lookup */ + { &vnop_create_desc, (VOPFUNC)fifo_create }, /* create */ + { &vnop_mknod_desc, (VOPFUNC)fifo_mknod }, /* mknod */ + { &vnop_open_desc, (VOPFUNC)fifo_open }, /* open */ + { &vnop_close_desc, (VOPFUNC)ufsfifo_close }, /* close */ + { &vnop_getattr_desc, (VOPFUNC)ufs_getattr }, /* getattr */ + { &vnop_setattr_desc, (VOPFUNC)ufs_setattr }, /* setattr */ + { &vnop_read_desc, (VOPFUNC)ufsfifo_read }, /* read */ + { &vnop_write_desc, (VOPFUNC)ufsfifo_write }, /* write */ + { &vnop_ioctl_desc, (VOPFUNC)fifo_ioctl }, /* ioctl */ + { &vnop_select_desc, (VOPFUNC)fifo_select }, /* select */ + { &vnop_revoke_desc, (VOPFUNC)fifo_revoke }, /* revoke */ + { &vnop_mmap_desc, (VOPFUNC)fifo_mmap }, /* mmap */ + { &vnop_fsync_desc, (VOPFUNC)ffs_fsync }, /* fsync */ + { &vnop_remove_desc, (VOPFUNC)fifo_remove }, /* remove */ + { &vnop_link_desc, (VOPFUNC)fifo_link }, /* link */ + { &vnop_rename_desc, (VOPFUNC)fifo_rename }, /* rename */ + { &vnop_mkdir_desc, (VOPFUNC)fifo_mkdir }, /* mkdir */ + { &vnop_rmdir_desc, (VOPFUNC)fifo_rmdir }, /* rmdir */ + { &vnop_symlink_desc, (VOPFUNC)fifo_symlink }, /* symlink */ + { &vnop_readdir_desc, (VOPFUNC)fifo_readdir }, /* readdir */ + { &vnop_readlink_desc, (VOPFUNC)fifo_readlink }, /* readlink */ + { &vnop_inactive_desc, (VOPFUNC)ufs_inactive }, /* inactive */ + { &vnop_reclaim_desc, (VOPFUNC)ffs_reclaim }, /* reclaim */ + { &vnop_strategy_desc, (VOPFUNC)fifo_strategy }, /* strategy */ + { &vnop_pathconf_desc, (VOPFUNC)fifo_pathconf }, /* pathconf */ + { &vnop_advlock_desc, (VOPFUNC)err_advlock }, /* advlock */ + { &vnop_bwrite_desc, (VOPFUNC)vn_bwrite }, + { &vnop_pagein_desc, (VOPFUNC)ffs_pagein }, /* Pagein */ + { &vnop_pageout_desc, (VOPFUNC)ffs_pageout }, /* Pageout */ + { &vnop_copyfile_desc, (VOPFUNC)err_copyfile }, /* Copy File */ + { &vnop_blktooff_desc, (VOPFUNC)ffs_blktooff }, /* blktooff */ + { &vnop_offtoblk_desc, (VOPFUNC)ffs_offtoblk }, /* offtoblk */ + { &vnop_blockmap_desc, (VOPFUNC)ufs_blockmap }, /* blockmap */ + { &vnop_kqfilt_add_desc, (VOPFUNC)ufsfifo_kqfilt_add }, /* kqfilt_add */ { (struct vnodeop_desc*)NULL, (int(*)())NULL } }; struct vnodeopv_desc ffs_fifoop_opv_desc = @@ -286,82 +242,34 @@ int doclusterwrite = 0; /* ARGSUSED */ int ffs_fsync(ap) - struct vop_fsync_args /* { + struct vnop_fsync_args /* { struct vnode *a_vp; - struct ucred *a_cred; int a_waitfor; - struct proc *a_p; + vfs_context_t a_context; } */ *ap; { - register struct vnode *vp = ap->a_vp; - register struct buf *bp; + return(ffs_fsync_internal(ap->a_vp, ap->a_waitfor)); +} + + +int +ffs_fsync_internal(vnode_t vp, int waitfor) +{ struct timeval tv; - struct buf *nbp; - int s; - struct inode *ip = VTOI(vp); - int retry = 0; + int wait = (waitfor == MNT_WAIT); /* * Write out any clusters. */ - cluster_push(vp); + cluster_push(vp, 0); /* * Flush all dirty buffers associated with a vnode. */ -loop: - s = splbio(); - for (bp = vp->v_dirtyblkhd.lh_first; bp; bp = nbp) { - nbp = bp->b_vnbufs.le_next; - if ((bp->b_flags & B_BUSY)) - continue; - if ((bp->b_flags & B_DELWRI) == 0) - panic("ffs_fsync: not dirty"); - bremfree(bp); - bp->b_flags |= B_BUSY; - splx(s); - /* - * Wait for I/O associated with indirect blocks to complete, - * since there is no way to quickly wait for them below. - */ - if (bp->b_vp == vp || ap->a_waitfor == MNT_NOWAIT) - (void) bawrite(bp); - else - (void) bwrite(bp); - goto loop; - } - - if (ap->a_waitfor == MNT_WAIT) { - while (vp->v_numoutput) { - vp->v_flag |= VBWAIT; - tsleep((caddr_t)&vp->v_numoutput, PRIBIO + 1, "ffs_fsync", 0); - } - - if (vp->v_dirtyblkhd.lh_first) { - /* still have some dirty buffers */ - if (retry++ > 10) { - vprint("ffs_fsync: dirty", vp); - splx(s); - /* - * Looks like the requests are not - * getting queued to the driver. - * Retrying here causes a cpu bound loop. - * Yield to the other threads and hope - * for the best. - */ - (void)tsleep((caddr_t)&vp->v_numoutput, - PRIBIO + 1, "ffs_fsync", hz/10); - retry = 0; - } else { - splx(s); - } - /* try again */ - goto loop; - } - } - splx(s); - tv = time; - return (VOP_UPDATE(ap->a_vp, &tv, &tv, ap->a_waitfor == MNT_WAIT)); + buf_flushdirtyblks(vp, wait, 0, "ffs_fsync"); + microtime(&tv); + + return (ffs_update(vp, &tv, &tv, wait)); } /* @@ -369,71 +277,63 @@ loop: */ int ffs_reclaim(ap) - struct vop_reclaim_args /* { + struct vnop_reclaim_args /* { struct vnode *a_vp; - struct proc *a_p; + vfs_context_t a_context; } */ *ap; { register struct vnode *vp = ap->a_vp; int error; - if (error = ufs_reclaim(vp, ap->a_p)) + if ( (error = ufs_reclaim(vp, vfs_context_proc(ap->a_context))) ) return (error); - FREE_ZONE(vp->v_data, sizeof (struct inode), - VFSTOUFS(vp->v_mount)->um_devvp->v_tag == VT_MFS ? - M_MFSNODE : M_FFSNODE); - vp->v_data = NULL; + + FREE_ZONE(vnode_fsnode(vp), sizeof (struct inode), M_FFSNODE); + + vnode_clearfsnode(vp); + return (0); } /* Blktooff converts a logical block number to a file offset */ int ffs_blktooff(ap) - struct vop_blktooff_args /* { + struct vnop_blktooff_args /* { struct vnode *a_vp; - daddr_t a_lblkno; + daddr64_t a_lblkno; off_t *a_offset; } */ *ap; { register struct inode *ip; register FS *fs; - ufs_daddr_t bn; - if (ap->a_vp == NULL) return (EINVAL); - ip = VTOI(ap->a_vp); - fs = ip->I_FS; - bn = ap->a_lblkno; + fs = VTOI(ap->a_vp)->I_FS; - if ((long)bn < 0) { - panic("-ve blkno in ffs_blktooff"); - bn = -(long)bn; - } + *ap->a_offset = (off_t)lblktosize(fs, ap->a_lblkno); - *ap->a_offset = (off_t)lblktosize(fs, bn); return (0); } /* Blktooff converts a logical block number to a file offset */ int ffs_offtoblk(ap) - struct vop_offtoblk_args /* { + struct vnop_offtoblk_args /* { struct vnode *a_vp; off_t a_offset; - daddr_t *a_lblkno; + daddr64_t *a_lblkno; } */ *ap; { - register struct inode *ip; - register FS *fs; + register FS *fs; if (ap->a_vp == NULL) return (EINVAL); - ip = VTOI(ap->a_vp); - fs = ip->I_FS; + fs = VTOI(ap->a_vp)->I_FS; + + *ap->a_lblkno = (daddr64_t)lblkno(fs, ap->a_offset); - *ap->a_lblkno = (daddr_t)lblkno(fs, ap->a_offset); return (0); }