xnu-4903.231.4.tar.gz

[apple/xnu.git] / bsd / vfs / vfs_support.c

diff --git a/bsd/vfs/vfs_support.c b/bsd/vfs/vfs_support.c
index 2fb73f4449eadd27f4264ddb029d75cff6d347cd..ed146fa8f6e80b86d277436e6852cd6ec6b65bdb 100644 (file)
--- a/bsd/vfs/vfs_support.c
+++ b/bsd/vfs/vfs_support.c
@@ -50,6 +50,7 @@
 
 #include <vfs/vfs_support.h>
 #include <sys/kauth.h>
 
 #include <vfs/vfs_support.h>
 #include <sys/kauth.h>

+#include <sys/ubc.h>   /* ubc_upl_abort_range() */

 
 
 struct vnop_create_args /* {
 
 
 struct vnop_create_args /* {


@@ -61,7 +62,7 @@ struct vnop_create_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_create(struct vnop_create_args *ap)
+nop_create(__unused struct vnop_create_args *ap)

 {
 #if DIAGNOSTIC
        if ((ap->a_cnp->cn_flags & HASBUF) == 0)
 {
 #if DIAGNOSTIC
        if ((ap->a_cnp->cn_flags & HASBUF) == 0)


@@ -86,13 +87,13 @@ struct vnop_whiteout_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_whiteout(struct vnop_whiteout_args *ap)
+nop_whiteout(__unused struct vnop_whiteout_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_whiteout(struct vnop_whiteout_args *ap)
+err_whiteout(__unused struct vnop_whiteout_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -107,7 +108,7 @@ struct vnop_mknod_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_mknod(struct vnop_mknod_args *ap)
+nop_mknod(__unused struct vnop_mknod_args *ap)

 {
 #if DIAGNOSTIC
        if ((ap->a_cnp->cn_flags & HASBUF) == 0)
 {
 #if DIAGNOSTIC
        if ((ap->a_cnp->cn_flags & HASBUF) == 0)


@@ -130,13 +131,13 @@ struct vnop_open_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_open(struct vnop_open_args *ap)
+nop_open(__unused struct vnop_open_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_open(struct vnop_open_args *ap)
+err_open(__unused struct vnop_open_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -149,13 +150,13 @@ struct vnop_close_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_close(struct vnop_close_args *ap)
+nop_close(__unused struct vnop_close_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_close(struct vnop_close_args *ap)
+err_close(__unused struct vnop_close_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -168,13 +169,13 @@ struct vnop_access_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_access(struct vnop_access_args *ap)
+nop_access(__unused struct vnop_access_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_access(struct vnop_access_args *ap)
+err_access(__unused struct vnop_access_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -187,13 +188,13 @@ struct vnop_getattr_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_getattr(struct vnop_getattr_args *ap)
+nop_getattr(__unused struct vnop_getattr_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_getattr(struct vnop_getattr_args *ap)
+err_getattr(__unused struct vnop_getattr_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -206,60 +207,17 @@ struct vnop_setattr_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_setattr(struct vnop_setattr_args *ap)
+nop_setattr(__unused struct vnop_setattr_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_setattr(struct vnop_setattr_args *ap)
+err_setattr(__unused struct vnop_setattr_args *ap)

 {
        return (ENOTSUP);
 }
 
 {
        return (ENOTSUP);
 }
 

-
-struct vnop_getattrlist_args /* {
-       struct vnode *a_vp;
-       struct attrlist *a_alist;
-       struct uio *a_uio;
-       int a_options;
-       vfs_context a_context;
-} */;
-
-int
-nop_getattrlist(struct vnop_getattrlist_args *ap)
-{
-       return (0);
-}
-
-int
-err_getattrlist(struct vnop_getattrlist_args *ap)
-{
-       return (ENOTSUP);
-}
-
-
-struct vnop_setattrlist_args /* {
-       struct vnode *a_vp;
-       struct attrlist *a_alist;
-       struct uio *a_uio;
-       int a_options;
-       vfs_context_t a_context;
-} */;
-
-int
-nop_setattrlist(struct vnop_setattrlist_args *ap)
-{
-       return (0);
-}
-
-int
-err_setattrlist(struct vnop_setattrlist_args *ap)
-{
-       return (ENOTSUP);
-}
-
-

 struct vnop_read_args /*  {
        struct vnode *a_vp;
        struct uio *a_uio;
 struct vnop_read_args /*  {
        struct vnode *a_vp;
        struct uio *a_uio;


@@ -268,13 +226,13 @@ struct vnop_read_args /*  {
 } */;
 
 int
 } */;
 
 int

-nop_read(struct vnop_read_args *ap)
+nop_read(__unused struct vnop_read_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_read(struct vnop_read_args *ap)
+err_read(__unused struct vnop_read_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -288,13 +246,13 @@ struct vnop_write_args /*  {
 } */;
 
 int
 } */;
 
 int

-nop_write(struct vnop_write_args *ap)
+nop_write(__unused struct vnop_write_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_write(struct vnop_write_args *ap)
+err_write(__unused struct vnop_write_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -316,7 +274,7 @@ nop_ioctl(__unused struct vnop_ioctl_args *ap)
 }
 
 int
 }
 
 int

-err_ioctl(struct vnop_ioctl_args *ap)
+err_ioctl(__unused struct vnop_ioctl_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -338,7 +296,7 @@ nop_select(__unused struct vnop_select_args *ap)
 }
 
 int
 }
 
 int

-err_select(struct vnop_select_args *ap)
+err_select(__unused struct vnop_select_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -352,13 +310,13 @@ struct vnop_exchange_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_exchange(struct vnop_exchange_args *ap)
+nop_exchange(__unused struct vnop_exchange_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_exchange(struct vnop_exchange_args *ap)
+err_exchange(__unused struct vnop_exchange_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -398,7 +356,7 @@ nop_mmap(__unused struct vnop_mmap_args *ap)
 }
 
 int
 }
 
 int

-err_mmap(struct vnop_mmap_args *ap)
+err_mmap(__unused struct vnop_mmap_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -411,13 +369,13 @@ struct vnop_fsync_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_fsync(struct vnop_fsync_args *ap)
+nop_fsync(__unused struct vnop_fsync_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_fsync(struct vnop_fsync_args *ap)
+err_fsync(__unused struct vnop_fsync_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -432,7 +390,7 @@ struct vnop_remove_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_remove(struct vnop_remove_args *ap)
+nop_remove(__unused struct vnop_remove_args *ap)

 {
        return (0);
 }
 {
        return (0);
 }


@@ -453,7 +411,7 @@ struct vnop_link_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_link(struct vnop_link_args *ap)
+nop_link(__unused struct vnop_link_args *ap)

 {
        return (0);
 }
 {
        return (0);
 }


@@ -477,7 +435,7 @@ struct vnop_rename_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_rename(struct vnop_rename_args *ap)
+nop_rename(__unused struct vnop_rename_args *ap)

 {
        return (0);
 }
 {
        return (0);
 }


@@ -499,13 +457,13 @@ struct vnop_mkdir_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_mkdir(struct vnop_mkdir_args *ap)
+nop_mkdir(__unused struct vnop_mkdir_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_mkdir(struct vnop_mkdir_args *ap)
+err_mkdir(__unused struct vnop_mkdir_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -519,7 +477,7 @@ struct vnop_rmdir_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_rmdir(struct vnop_rmdir_args *ap)
+nop_rmdir(__unused struct vnop_rmdir_args *ap)

 {
        return (0);
 }
 {
        return (0);
 }


@@ -542,7 +500,7 @@ struct vnop_symlink_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_symlink(struct vnop_symlink_args *ap)
+nop_symlink(__unused struct vnop_symlink_args *ap)

 {
 #if DIAGNOSTIC
        if ((ap->a_cnp->cn_flags & HASBUF) == 0)
 {
 #if DIAGNOSTIC
        if ((ap->a_cnp->cn_flags & HASBUF) == 0)


@@ -569,29 +527,30 @@ struct vnop_readdir_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_readdir(struct vnop_readdir_args *ap)
+nop_readdir(__unused struct vnop_readdir_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_readdir(struct vnop_readdir_args *ap)
+err_readdir(__unused struct vnop_readdir_args *ap)

 {
        return (ENOTSUP);
 }
 
 
 struct vnop_readdirattr_args /* {
 {
        return (ENOTSUP);
 }
 
 
 struct vnop_readdirattr_args /* {

-       struct vnode *a_vp;
+       struct vnodeop_desc *a_desc;
+       vnode_t a_vp;

        struct attrlist *a_alist;
        struct uio *a_uio;
        u_long a_maxcount;
        struct attrlist *a_alist;
        struct uio *a_uio;
        u_long a_maxcount;

-        u_long a_options;
-        int *a_newstate;
+       u_long a_options;
+       u_long *a_newstate;

        int *a_eofflag;
        int *a_eofflag;

-       u_long *a_actualcount;
+       u_long *a_actualcount;

        vfs_context_t a_context;
        vfs_context_t a_context;

-} */;
+} */ ;

 
 int
 nop_readdirattr(struct vnop_readdirattr_args *ap)
 
 int
 nop_readdirattr(struct vnop_readdirattr_args *ap)


@@ -616,13 +575,13 @@ struct vnop_readlink_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_readlink(struct vnop_readlink_args *ap)
+nop_readlink(__unused struct vnop_readlink_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_readlink(struct vnop_readlink_args *ap)
+err_readlink(__unused struct vnop_readlink_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -634,7 +593,7 @@ struct vnop_inactive_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_inactive(struct vnop_inactive_args *ap)
+nop_inactive(__unused struct vnop_inactive_args *ap)

 {
        return (0);
 }
 {
        return (0);
 }


@@ -653,13 +612,13 @@ struct vnop_reclaim_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_reclaim(struct vnop_reclaim_args *ap)
+nop_reclaim(__unused struct vnop_reclaim_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_reclaim(struct vnop_reclaim_args *ap)
+err_reclaim(__unused struct vnop_reclaim_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -670,13 +629,13 @@ struct vnop_strategy_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_strategy(struct vnop_strategy_args *ap)
+nop_strategy(__unused struct vnop_strategy_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_strategy(struct vnop_strategy_args *ap)
+err_strategy(__unused struct vnop_strategy_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -685,18 +644,18 @@ err_strategy(struct vnop_strategy_args *ap)
 struct vnop_pathconf_args /* {
        struct vnode *a_vp;
        int a_name;
 struct vnop_pathconf_args /* {
        struct vnode *a_vp;
        int a_name;

-       register_t *a_retval;
+       int32_t *a_retval;

        vfs_context_t a_context;
 } */;
 
 int
        vfs_context_t a_context;
 } */;
 
 int

-nop_pathconf(struct vnop_pathconf_args *ap)
+nop_pathconf(__unused struct vnop_pathconf_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_pathconf(struct vnop_pathconf_args *ap)
+err_pathconf(__unused struct vnop_pathconf_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -712,13 +671,13 @@ struct vnop_advlock_args /* {
 } */;
 
 int
 } */;
 
 int

-nop_advlock(struct vnop_advlock_args *ap)
+nop_advlock(__unused struct vnop_advlock_args *ap)

 {
        return (0);
 }
 
 int
 {
        return (0);
 }
 
 int

-err_advlock(struct vnop_advlock_args *ap)
+err_advlock(__unused struct vnop_advlock_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -759,7 +718,7 @@ nop_bwrite(struct vnop_bwrite_args *ap)
 }
 
 int
 }
 
 int

-err_bwrite(struct vnop_bwrite_args *ap)
+err_bwrite(__unused struct vnop_bwrite_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }


@@ -819,27 +778,6 @@ err_pageout(struct vnop_pageout_args *ap)
 }
 
 
 }
 
 

-struct vnop_devblocksize_args /* {
-       struct vnode *a_vp;
-       register_t *a_retval;
-} */;
-
-int
-nop_devblocksize(struct vnop_devblocksize_args *ap)
-{
-       /* XXX default value because the call sites do not check error */
-       *ap->a_retval = 512;
-       return (0);
-}
-
-int
-err_devblocksize(struct vnop_devblocksize_args *ap)
-{
-       (void)nop_devblocksize(ap);
-       return (ENOTSUP);
-}
-
-

 struct vnop_searchfs /* {
        struct vnode *a_vp;
        void *a_searchparams1;
 struct vnop_searchfs /* {
        struct vnode *a_vp;
        void *a_searchparams1;


@@ -880,7 +818,7 @@ struct vnop_copyfile_args /*{
 }*/; 
 
 int
 }*/; 
 
 int

-nop_copyfile(struct vnop_copyfile_args *ap)
+nop_copyfile(__unused struct vnop_copyfile_args *ap)

 {
        return (0);
 }
 {
        return (0);
 }


@@ -944,12 +882,12 @@ struct vnop_blockmap_args /* {
        int a_flags;
 } */;
 
        int a_flags;
 } */;
 

-int nop_blockmap(struct vnop_blockmap_args *ap)
+int nop_blockmap(__unused struct vnop_blockmap_args *ap)

 {
        return (0);
 }
 
 {
        return (0);
 }
 

-int err_blockmap(struct vnop_blockmap_args *ap)
+int err_blockmap(__unused struct vnop_blockmap_args *ap)

 {
        return (ENOTSUP);
 }
 {
        return (ENOTSUP);
 }