diff options
Diffstat (limited to 'usr/src/uts/common/sys/fs')
| -rw-r--r-- | usr/src/uts/common/sys/fs/cachefs_dir.h | 8 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/fs/cachefs_dlog.h | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/fs/cachefs_fs.h | 8 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/fs/ufs_filio.h | 8 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/fs/ufs_prot.h | 44 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/fs/ufs_trans.h | 8 |
6 files changed, 21 insertions, 61 deletions
diff --git a/usr/src/uts/common/sys/fs/cachefs_dir.h b/usr/src/uts/common/sys/fs/cachefs_dir.h index 2ae4af3910..c223b1c688 100644 --- a/usr/src/uts/common/sys/fs/cachefs_dir.h +++ b/usr/src/uts/common/sys/fs/cachefs_dir.h @@ -20,6 +20,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,8 +29,6 @@ #ifndef _SYS_FS_CACHEFS_DIR_H #define _SYS_FS_CACHEFS_DIR_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/fs/cachefs_fs.h> @@ -71,7 +71,7 @@ struct c_dirent { #define CDE_COMPLETE 0x2 /* entry is complete */ -#if defined(_KERNEL) && defined(__STDC__) +#if defined(_KERNEL) int cachefs_dir_look(cnode_t *dcp, char *nm, fid_t *cookiep, uint_t *flagp, u_offset_t *d_offsetp, cfs_cid_t *cidp); int cachefs_dir_new(cnode_t *dcp, cnode_t *cp); @@ -86,7 +86,7 @@ int cachefs_dir_empty(cnode_t *dcp); int cachefs_async_populate_dir(struct cachefs_populate_req *, cred_t *, vnode_t *, vnode_t *); -#endif /* defined(_KERNEL) && defined(__STDC__) */ +#endif /* defined(_KERNEL) */ #ifdef __cplusplus } diff --git a/usr/src/uts/common/sys/fs/cachefs_dlog.h b/usr/src/uts/common/sys/fs/cachefs_dlog.h index 9f598de55b..3914cad114 100644 --- a/usr/src/uts/common/sys/fs/cachefs_dlog.h +++ b/usr/src/uts/common/sys/fs/cachefs_dlog.h @@ -20,6 +20,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,8 +29,6 @@ #ifndef _SYS_FS_CACHEFS_DLOG_H #define _SYS_FS_CACHEFS_DLOG_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/vfs.h> #include <sys/acl.h> @@ -279,7 +279,7 @@ typedef struct cfs_dlog_entry cfs_dlog_entry_t; offsetof(struct cfs_dlog_entry, dl_u.dl_setsecattr) + \ CFS_DLOG_SECATTR_MAXSIZE) -#if defined(_KERNEL) && defined(__STDC__) +#if defined(_KERNEL) int cachefs_dlog_setup(fscache_t *fscp, int createfile); void cachefs_dlog_teardown(fscache_t *fscp); int cachefs_dlog_commit(fscache_t *fscp, off_t offset, int error); diff --git a/usr/src/uts/common/sys/fs/cachefs_fs.h b/usr/src/uts/common/sys/fs/cachefs_fs.h index ae0d900ada..30bc223a2b 100644 --- a/usr/src/uts/common/sys/fs/cachefs_fs.h +++ b/usr/src/uts/common/sys/fs/cachefs_fs.h @@ -20,6 +20,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,8 +29,6 @@ #ifndef _SYS_FS_CACHEFS_FS_H #define _SYS_FS_CACHEFS_FS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/vnode.h> #include <sys/vfs.h> #include <sys/types.h> @@ -1107,7 +1107,7 @@ typedef struct cachefs_debug_info { /* * cachefs function prototypes */ -#if defined(_KERNEL) && defined(__STDC__) +#if defined(_KERNEL) extern int cachefs_getcookie(vnode_t *, struct fid *, struct vattr *, cred_t *, uint32_t); cachefscache_t *cachefs_cache_create(void); @@ -1305,7 +1305,7 @@ extern void *cachefs_kmem_zalloc(size_t, int); extern void cachefs_kmem_free(void *, size_t); extern char *cachefs_strdup(char *); -#endif /* defined (_KERNEL) && defined (__STDC__) */ +#endif /* defined (_KERNEL) */ diff --git a/usr/src/uts/common/sys/fs/ufs_filio.h b/usr/src/uts/common/sys/fs/ufs_filio.h index 052be12ef4..127a197217 100644 --- a/usr/src/uts/common/sys/fs/ufs_filio.h +++ b/usr/src/uts/common/sys/fs/ufs_filio.h @@ -19,6 +19,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -26,8 +28,6 @@ #ifndef _SYS_FS_UFS_FILIO_H #define _SYS_FS_UFS_FILIO_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -88,7 +88,7 @@ typedef struct fiolog { #define FIOLOG_ECLEAN 5 #define FIOLOG_ENOULOCK 6 -#if defined(_KERNEL) && defined(__STDC__) +#if defined(_KERNEL) extern int ufs_fiosatime(struct vnode *, struct timeval *, int, struct cred *); @@ -104,7 +104,7 @@ extern int ufs_fioislog(vnode_t *, uint32_t *, cred_t *, int); extern int ufs_fio_holey(vnode_t *, int, offset_t *); extern int ufs_mark_compressed(struct vnode *vp); -#endif /* defined(_KERNEL) && defined(__STDC__) */ +#endif /* defined(_KERNEL) */ #ifdef __cplusplus } diff --git a/usr/src/uts/common/sys/fs/ufs_prot.h b/usr/src/uts/common/sys/fs/ufs_prot.h index e1810198e7..2cd9683a1b 100644 --- a/usr/src/uts/common/sys/fs/ufs_prot.h +++ b/usr/src/uts/common/sys/fs/ufs_prot.h @@ -20,6 +20,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -32,8 +34,6 @@ #ifndef _SYS_FS_UFS_PROT_H #define _SYS_FS_UFS_PROT_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <rpc/rpc.h> #ifdef __cplusplus @@ -166,7 +166,6 @@ typedef struct ufsd_msg_t ufsd_msg_t; #define UFSD_PROG ((unsigned long)(100233)) #define UFSD_VERS ((unsigned long)(1)) -#if defined(__STDC__) || defined(__cplusplus) #define UFSD_NULL ((unsigned long)(0)) extern ufsdrc_t *ufsd_null_1(void *, CLIENT *); extern ufsdrc_t *ufsd_null_1_svc(void *, struct svc_req *); @@ -189,31 +188,8 @@ extern ufsdrc_t *ufsd_exit_1(void *, CLIENT *); extern ufsdrc_t *ufsd_exit_1_svc(void *, struct svc_req *); extern int ufsd_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t); -#else /* K&R C */ -#define UFSD_NULL ((unsigned long)(0)) -extern ufsdrc_t *ufsd_null_1(); -extern ufsdrc_t *ufsd_null_1_svc(); -#define UFSD_REPAIRFS ((unsigned long)(1)) -extern ufsdrc_t *ufsd_repairfs_1(); -extern ufsdrc_t *ufsd_repairfs_1_svc(); -#define UFSD_REPAIRFSLIST ((unsigned long)(2)) -extern ufsdrc_t *ufsd_repairfslist_1(); -extern ufsdrc_t *ufsd_repairfslist_1_svc(); -#define UFSD_SEND ((unsigned long)(3)) -extern ufsdrc_t *ufsd_send_1(); -extern ufsdrc_t *ufsd_send_1_svc(); -#define UFSD_RECV ((unsigned long)(4)) -extern ufsdrc_t *ufsd_recv_1(); -extern ufsdrc_t *ufsd_recv_1_svc(); -#define UFSD_EXIT ((unsigned long)(5)) -extern ufsdrc_t *ufsd_exit_1(); -extern ufsdrc_t *ufsd_exit_1_svc(); -extern int ufsd_prog_1_freeresult(); -#endif /* K&R C */ - /* the xdr functions */ -#if defined(__STDC__) || defined(__cplusplus) extern bool_t xdr_ufsdrc_t(XDR *, ufsdrc_t *); extern bool_t xdr_fs_identity_t(XDR *, fs_identity_t *); extern bool_t xdr_ufsd_repairfs_args_t(XDR *, ufsd_repairfs_args_t *); @@ -227,22 +203,6 @@ extern bool_t xdr_ufsd_log_msg_t(XDR *, ufsd_log_msg_t *); extern bool_t xdr_ufsd_msg_vardata_t(XDR *, ufsd_msg_vardata_t *); extern bool_t xdr_ufsd_msg_t(XDR *, ufsd_msg_t *); -#else /* K&R C */ -extern bool_t xdr_ufsdrc_t(); -extern bool_t xdr_fs_identity_t(); -extern bool_t xdr_ufsd_repairfs_args_t(); -extern bool_t xdr_ufsd_repairfs_list_t(); -extern bool_t xdr_ufsd_event_t(); -extern bool_t xdr_ufsd_boot_type_t(); -extern bool_t xdr_ufsd_log_op_t(); -extern bool_t xdr_ufsd_fsck_state_t(); -extern bool_t xdr_ufsd_log_data_t(); -extern bool_t xdr_ufsd_log_msg_t(); -extern bool_t xdr_ufsd_msg_vardata_t(); -extern bool_t xdr_ufsd_msg_t(); - -#endif /* K&R C */ - #ifdef __cplusplus } #endif diff --git a/usr/src/uts/common/sys/fs/ufs_trans.h b/usr/src/uts/common/sys/fs/ufs_trans.h index 53538c694c..cdaf55c87c 100644 --- a/usr/src/uts/common/sys/fs/ufs_trans.h +++ b/usr/src/uts/common/sys/fs/ufs_trans.h @@ -20,6 +20,8 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,8 +29,6 @@ #ifndef _SYS_FS_UFS_TRANS_H #define _SYS_FS_UFS_TRANS_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -481,7 +481,7 @@ struct ufsvfs; /* * ufs trans function prototypes */ -#if defined(_KERNEL) && defined(__STDC__) +#if defined(_KERNEL) extern int ufs_trans_hlock(); extern void ufs_trans_onerror(); @@ -538,7 +538,7 @@ void top_matadel(struct ufsvfs *ufsvfsp, offset_t mof, off_t nb); void top_mataclr(struct ufsvfs *ufsvfsp); -#endif /* defined(_KERNEL) && defined(__STDC__) */ +#endif /* defined(_KERNEL) */ #ifdef __cplusplus } |