--- zzzz-none-000/linux-2.6.28.10/include/linux/security.h 2009-05-02 18:54:43.000000000 +0000 +++ puma5-6360-529/linux-2.6.28.10/include/linux/security.h 2011-04-04 13:20:30.000000000 +0000 @@ -1724,14 +1724,17 @@ void security_release_secctx(char *secdata, u32 seclen); #else /* CONFIG_SECURITY */ +#ifndef __unused__ +#define __unused__ __attribute__ ((unused)) +#endif /*--- #ifndef __unused__ ---*/ struct security_mnt_opts { }; -static inline void security_init_mnt_opts(struct security_mnt_opts *opts) +static inline void security_init_mnt_opts(struct security_mnt_opts *opts __unused__) { } -static inline void security_free_mnt_opts(struct security_mnt_opts *opts) +static inline void security_free_mnt_opts(struct security_mnt_opts *opts __unused__) { } @@ -1785,23 +1788,23 @@ return cap_capable(tsk, cap); } -static inline int security_acct(struct file *file) +static inline int security_acct(struct file *file __unused__) { return 0; } -static inline int security_sysctl(struct ctl_table *table, int op) +static inline int security_sysctl(struct ctl_table *table __unused__, int op __unused__) { return 0; } -static inline int security_quotactl(int cmds, int type, int id, - struct super_block *sb) +static inline int security_quotactl(int cmds __unused__, int type __unused__, int id __unused__, + struct super_block *sb __unused__) { return 0; } -static inline int security_quota_on(struct dentry *dentry) +static inline int security_quota_on(struct dentry *dentry __unused__) { return 0; } @@ -1835,12 +1838,12 @@ return cap_vm_enough_memory(current->mm, pages); } -static inline int security_bprm_alloc(struct linux_binprm *bprm) +static inline int security_bprm_alloc(struct linux_binprm *bprm __unused__) { return 0; } -static inline void security_bprm_free(struct linux_binprm *bprm) +static inline void security_bprm_free(struct linux_binprm *bprm __unused__) { } static inline void security_bprm_apply_creds(struct linux_binprm *bprm, int unsafe) @@ -1848,7 +1851,7 @@ cap_bprm_apply_creds(bprm, unsafe); } -static inline void security_bprm_post_apply_creds(struct linux_binprm *bprm) +static inline void security_bprm_post_apply_creds(struct linux_binprm *bprm __unused__) { return; } @@ -1858,7 +1861,7 @@ return cap_bprm_set_security(bprm); } -static inline int security_bprm_check(struct linux_binprm *bprm) +static inline int security_bprm_check(struct linux_binprm *bprm __unused__) { return 0; } @@ -1868,193 +1871,193 @@ return cap_bprm_secureexec(bprm); } -static inline int security_sb_alloc(struct super_block *sb) +static inline int security_sb_alloc(struct super_block *sb __unused__) { return 0; } -static inline void security_sb_free(struct super_block *sb) +static inline void security_sb_free(struct super_block *sb __unused__) { } -static inline int security_sb_copy_data(char *orig, char *copy) +static inline int security_sb_copy_data(char *orig __unused__, char *copy __unused__) { return 0; } -static inline int security_sb_kern_mount(struct super_block *sb, void *data) +static inline int security_sb_kern_mount(struct super_block *sb __unused__, void *data __unused__) { return 0; } -static inline int security_sb_show_options(struct seq_file *m, - struct super_block *sb) +static inline int security_sb_show_options(struct seq_file *m __unused__, + struct super_block *sb __unused__) { return 0; } -static inline int security_sb_statfs(struct dentry *dentry) +static inline int security_sb_statfs(struct dentry *dentry __unused__) { return 0; } -static inline int security_sb_mount(char *dev_name, struct path *path, - char *type, unsigned long flags, - void *data) +static inline int security_sb_mount(char *dev_name __unused__, struct path *path __unused__, + char *type __unused__, unsigned long flags __unused__, + void *data __unused__) { return 0; } -static inline int security_sb_check_sb(struct vfsmount *mnt, - struct path *path) +static inline int security_sb_check_sb(struct vfsmount *mnt __unused__, + struct path *path __unused__) { return 0; } -static inline int security_sb_umount(struct vfsmount *mnt, int flags) +static inline int security_sb_umount(struct vfsmount *mnt __unused__, int flags __unused__) { return 0; } -static inline void security_sb_umount_close(struct vfsmount *mnt) +static inline void security_sb_umount_close(struct vfsmount *mnt __unused__) { } -static inline void security_sb_umount_busy(struct vfsmount *mnt) +static inline void security_sb_umount_busy(struct vfsmount *mnt __unused__) { } -static inline void security_sb_post_remount(struct vfsmount *mnt, - unsigned long flags, void *data) +static inline void security_sb_post_remount(struct vfsmount *mnt __unused__, + unsigned long flags, void *data __unused__) { } -static inline void security_sb_post_addmount(struct vfsmount *mnt, - struct path *mountpoint) +static inline void security_sb_post_addmount(struct vfsmount *mnt __unused__, + struct path *mountpoint __unused__) { } -static inline int security_sb_pivotroot(struct path *old_path, - struct path *new_path) +static inline int security_sb_pivotroot(struct path *old_path __unused__, + struct path *new_path __unused__) { return 0; } -static inline void security_sb_post_pivotroot(struct path *old_path, - struct path *new_path) +static inline void security_sb_post_pivotroot(struct path *old_path __unused__, + struct path *new_path __unused__) { } -static inline int security_sb_set_mnt_opts(struct super_block *sb, - struct security_mnt_opts *opts) +static inline int security_sb_set_mnt_opts(struct super_block *sb __unused__, + struct security_mnt_opts *opts __unused__) { return 0; } -static inline void security_sb_clone_mnt_opts(const struct super_block *oldsb, - struct super_block *newsb) +static inline void security_sb_clone_mnt_opts(const struct super_block *oldsb __unused__, + struct super_block *newsb __unused__) { } -static inline int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts) +static inline int security_sb_parse_opts_str(char *options __unused__, struct security_mnt_opts *opts __unused__) { return 0; } -static inline int security_inode_alloc(struct inode *inode) +static inline int security_inode_alloc(struct inode *inode __unused__) { return 0; } -static inline void security_inode_free(struct inode *inode) +static inline void security_inode_free(struct inode *inode __unused__) { } -static inline int security_inode_init_security(struct inode *inode, - struct inode *dir, - char **name, - void **value, - size_t *len) +static inline int security_inode_init_security(struct inode *inode __unused__, + struct inode *dir __unused__, + char **name __unused__, + void **value __unused__, + size_t *len __unused__) { return -EOPNOTSUPP; } -static inline int security_inode_create(struct inode *dir, - struct dentry *dentry, - int mode) +static inline int security_inode_create(struct inode *dir __unused__, + struct dentry *dentry __unused__, + int mode __unused__) { return 0; } -static inline int security_inode_link(struct dentry *old_dentry, - struct inode *dir, - struct dentry *new_dentry) +static inline int security_inode_link(struct dentry *old_dentry __unused__, + struct inode *dir __unused__, + struct dentry *new_dentry __unused__) { return 0; } -static inline int security_inode_unlink(struct inode *dir, - struct dentry *dentry) +static inline int security_inode_unlink(struct inode *dir __unused__, + struct dentry *dentry __unused__) { return 0; } -static inline int security_inode_symlink(struct inode *dir, - struct dentry *dentry, - const char *old_name) +static inline int security_inode_symlink(struct inode *dir __unused__, + struct dentry *dentry __unused__, + const char *old_name __unused__) { return 0; } -static inline int security_inode_mkdir(struct inode *dir, - struct dentry *dentry, - int mode) +static inline int security_inode_mkdir(struct inode *dir __unused__, + struct dentry *dentry __unused__, + int mode __unused__) { return 0; } -static inline int security_inode_rmdir(struct inode *dir, - struct dentry *dentry) +static inline int security_inode_rmdir(struct inode *dir __unused__, + struct dentry *dentry __unused__) { return 0; } -static inline int security_inode_mknod(struct inode *dir, - struct dentry *dentry, - int mode, dev_t dev) +static inline int security_inode_mknod(struct inode *dir __unused__, + struct dentry *dentry __unused__, + int mode, dev_t dev __unused__) { return 0; } -static inline int security_inode_rename(struct inode *old_dir, - struct dentry *old_dentry, - struct inode *new_dir, - struct dentry *new_dentry) +static inline int security_inode_rename(struct inode *old_dir __unused__, + struct dentry *old_dentry __unused__, + struct inode *new_dir __unused__, + struct dentry *new_dentry __unused__) { return 0; } -static inline int security_inode_readlink(struct dentry *dentry) +static inline int security_inode_readlink(struct dentry *dentry __unused__) { return 0; } -static inline int security_inode_follow_link(struct dentry *dentry, - struct nameidata *nd) +static inline int security_inode_follow_link(struct dentry *dentry __unused__, + struct nameidata *nd __unused__) { return 0; } -static inline int security_inode_permission(struct inode *inode, int mask) +static inline int security_inode_permission(struct inode *inode __unused__, int mask __unused__) { return 0; } -static inline int security_inode_setattr(struct dentry *dentry, - struct iattr *attr) +static inline int security_inode_setattr(struct dentry *dentry __unused__, + struct iattr *attr __unused__) { return 0; } -static inline int security_inode_getattr(struct vfsmount *mnt, - struct dentry *dentry) +static inline int security_inode_getattr(struct vfsmount *mnt __unused__, + struct dentry *dentry __unused__) { return 0; } -static inline void security_inode_delete(struct inode *inode) +static inline void security_inode_delete(struct inode *inode __unused__) { } static inline int security_inode_setxattr(struct dentry *dentry, @@ -2063,17 +2066,17 @@ return cap_inode_setxattr(dentry, name, value, size, flags); } -static inline void security_inode_post_setxattr(struct dentry *dentry, - const char *name, const void *value, size_t size, int flags) +static inline void security_inode_post_setxattr(struct dentry *dentry __unused__, + const char *name __unused__, const void *value __unused__, size_t size __unused__, int flags __unused__) { } -static inline int security_inode_getxattr(struct dentry *dentry, - const char *name) +static inline int security_inode_getxattr(struct dentry *dentry __unused__, + const char *name __unused__) { return 0; } -static inline int security_inode_listxattr(struct dentry *dentry) +static inline int security_inode_listxattr(struct dentry *dentry __unused__) { return 0; } @@ -2094,109 +2097,109 @@ return cap_inode_killpriv(dentry); } -static inline int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc) +static inline int security_inode_getsecurity(const struct inode *inode __unused__, const char *name __unused__, void **buffer __unused__, bool alloc __unused__) { return -EOPNOTSUPP; } -static inline int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags) +static inline int security_inode_setsecurity(struct inode *inode __unused__, const char *name __unused__, const void *value __unused__, size_t size __unused__, int flags __unused__) { return -EOPNOTSUPP; } -static inline int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size) +static inline int security_inode_listsecurity(struct inode *inode __unused__, char *buffer __unused__, size_t buffer_size __unused__) { return 0; } -static inline void security_inode_getsecid(const struct inode *inode, u32 *secid) +static inline void security_inode_getsecid(const struct inode *inode __unused__, u32 *secid) { *secid = 0; } -static inline int security_file_permission(struct file *file, int mask) +static inline int security_file_permission(struct file *file __unused__, int mask __unused__) { return 0; } -static inline int security_file_alloc(struct file *file) +static inline int security_file_alloc(struct file *file __unused__) { return 0; } -static inline void security_file_free(struct file *file) +static inline void security_file_free(struct file *file __unused__) { } -static inline int security_file_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) +static inline int security_file_ioctl(struct file *file __unused__, unsigned int cmd __unused__, + unsigned long arg __unused__) { return 0; } -static inline int security_file_mmap(struct file *file, unsigned long reqprot, - unsigned long prot, - unsigned long flags, - unsigned long addr, - unsigned long addr_only) +static inline int security_file_mmap(struct file *file __unused__, unsigned long reqprot __unused__, + unsigned long prot __unused__, + unsigned long flags __unused__, + unsigned long addr __unused__, + unsigned long addr_only __unused__) { return 0; } -static inline int security_file_mprotect(struct vm_area_struct *vma, - unsigned long reqprot, - unsigned long prot) +static inline int security_file_mprotect(struct vm_area_struct *vma __unused__, + unsigned long reqprot __unused__, + unsigned long prot __unused__) { return 0; } -static inline int security_file_lock(struct file *file, unsigned int cmd) +static inline int security_file_lock(struct file *file __unused__, unsigned int cmd __unused__) { return 0; } -static inline int security_file_fcntl(struct file *file, unsigned int cmd, - unsigned long arg) +static inline int security_file_fcntl(struct file *file __unused__, unsigned int cmd __unused__, + unsigned long arg __unused__) { return 0; } -static inline int security_file_set_fowner(struct file *file) +static inline int security_file_set_fowner(struct file *file __unused__) { return 0; } -static inline int security_file_send_sigiotask(struct task_struct *tsk, - struct fown_struct *fown, - int sig) +static inline int security_file_send_sigiotask(struct task_struct *tsk __unused__, + struct fown_struct *fown __unused__, + int sig __unused__) { return 0; } -static inline int security_file_receive(struct file *file) +static inline int security_file_receive(struct file *file __unused__) { return 0; } -static inline int security_dentry_open(struct file *file) +static inline int security_dentry_open(struct file *file __unused__) { return 0; } -static inline int security_task_create(unsigned long clone_flags) +static inline int security_task_create(unsigned long clone_flags __unused__) { return 0; } -static inline int security_task_alloc(struct task_struct *p) +static inline int security_task_alloc(struct task_struct *p __unused__) { return 0; } -static inline void security_task_free(struct task_struct *p) +static inline void security_task_free(struct task_struct *p __unused__) { } -static inline int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, - int flags) +static inline int security_task_setuid(uid_t id0 __unused__, uid_t id1 __unused__, uid_t id2 __unused__, + int flags __unused__) { return 0; } @@ -2207,33 +2210,33 @@ return cap_task_post_setuid(old_ruid, old_euid, old_suid, flags); } -static inline int security_task_setgid(gid_t id0, gid_t id1, gid_t id2, - int flags) +static inline int security_task_setgid(gid_t id0 __unused__, gid_t id1 __unused__, gid_t id2 __unused__, + int flags __unused__) { return 0; } -static inline int security_task_setpgid(struct task_struct *p, pid_t pgid) +static inline int security_task_setpgid(struct task_struct *p __unused__, pid_t pgid __unused__) { return 0; } -static inline int security_task_getpgid(struct task_struct *p) +static inline int security_task_getpgid(struct task_struct *p __unused__) { return 0; } -static inline int security_task_getsid(struct task_struct *p) +static inline int security_task_getsid(struct task_struct *p __unused__) { return 0; } -static inline void security_task_getsecid(struct task_struct *p, u32 *secid) +static inline void security_task_getsecid(struct task_struct *p __unused__, u32 *secid __unused__) { *secid = 0; } -static inline int security_task_setgroups(struct group_info *group_info) +static inline int security_task_setgroups(struct group_info *group_info __unused__) { return 0; } @@ -2248,13 +2251,13 @@ return cap_task_setioprio(p, ioprio); } -static inline int security_task_getioprio(struct task_struct *p) +static inline int security_task_getioprio(struct task_struct *p __unused__) { return 0; } -static inline int security_task_setrlimit(unsigned int resource, - struct rlimit *new_rlim) +static inline int security_task_setrlimit(unsigned int resource __unused__, + struct rlimit *new_rlim __unused__) { return 0; } @@ -2266,24 +2269,24 @@ return cap_task_setscheduler(p, policy, lp); } -static inline int security_task_getscheduler(struct task_struct *p) +static inline int security_task_getscheduler(struct task_struct *p __unused__) { return 0; } -static inline int security_task_movememory(struct task_struct *p) +static inline int security_task_movememory(struct task_struct *p __unused__) { return 0; } -static inline int security_task_kill(struct task_struct *p, - struct siginfo *info, int sig, - u32 secid) +static inline int security_task_kill(struct task_struct *p __unused__, + struct siginfo *info __unused__, int sig __unused__, + u32 secid __unused__) { return 0; } -static inline int security_task_wait(struct task_struct *p) +static inline int security_task_wait(struct task_struct *p __unused__) { return 0; } @@ -2301,82 +2304,82 @@ cap_task_reparent_to_init(p); } -static inline void security_task_to_inode(struct task_struct *p, struct inode *inode) +static inline void security_task_to_inode(struct task_struct *p __unused__, struct inode *inode __unused__) { } -static inline int security_ipc_permission(struct kern_ipc_perm *ipcp, - short flag) +static inline int security_ipc_permission(struct kern_ipc_perm *ipcp __unused__, + short flag __unused__) { return 0; } -static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid) +static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp __unused__, u32 *secid) { *secid = 0; } -static inline int security_msg_msg_alloc(struct msg_msg *msg) +static inline int security_msg_msg_alloc(struct msg_msg *msg __unused__) { return 0; } -static inline void security_msg_msg_free(struct msg_msg *msg) +static inline void security_msg_msg_free(struct msg_msg *msg __unused__) { } -static inline int security_msg_queue_alloc(struct msg_queue *msq) +static inline int security_msg_queue_alloc(struct msg_queue *msq __unused__) { return 0; } -static inline void security_msg_queue_free(struct msg_queue *msq) +static inline void security_msg_queue_free(struct msg_queue *msq __unused__) { } -static inline int security_msg_queue_associate(struct msg_queue *msq, - int msqflg) +static inline int security_msg_queue_associate(struct msg_queue *msq __unused__, + int msqflg __unused__) { return 0; } -static inline int security_msg_queue_msgctl(struct msg_queue *msq, int cmd) +static inline int security_msg_queue_msgctl(struct msg_queue *msq __unused__, int cmd __unused__) { return 0; } -static inline int security_msg_queue_msgsnd(struct msg_queue *msq, - struct msg_msg *msg, int msqflg) +static inline int security_msg_queue_msgsnd(struct msg_queue *msq __unused__, + struct msg_msg *msg __unused__, int msqflg __unused__) { return 0; } -static inline int security_msg_queue_msgrcv(struct msg_queue *msq, - struct msg_msg *msg, - struct task_struct *target, - long type, int mode) +static inline int security_msg_queue_msgrcv(struct msg_queue *msq __unused__, + struct msg_msg *msg __unused__, + struct task_struct *target __unused__, + long type __unused__, int mode __unused__) { return 0; } -static inline int security_shm_alloc(struct shmid_kernel *shp) +static inline int security_shm_alloc(struct shmid_kernel *shp __unused__) { return 0; } -static inline void security_shm_free(struct shmid_kernel *shp) +static inline void security_shm_free(struct shmid_kernel *shp __unused__) { } -static inline int security_shm_associate(struct shmid_kernel *shp, - int shmflg) +static inline int security_shm_associate(struct shmid_kernel *shp __unused__, + int shmflg __unused__) { return 0; } -static inline int security_shm_shmctl(struct shmid_kernel *shp, int cmd) +static inline int security_shm_shmctl(struct shmid_kernel *shp __unused__, int cmd __unused__) { return 0; } -static inline int security_shm_shmat(struct shmid_kernel *shp, - char __user *shmaddr, int shmflg) +static inline int security_shm_shmat(struct shmid_kernel *shp __unused__, + char __user *shmaddr __unused__, int shmflg __unused__) { return 0; } @@ -2386,35 +2389,35 @@ return 0; } -static inline void security_sem_free(struct sem_array *sma) +static inline void security_sem_free(struct sem_array *sma __unused__) { } -static inline int security_sem_associate(struct sem_array *sma, int semflg) +static inline int security_sem_associate(struct sem_array *sma __unused__, int semflg __unused__) { return 0; } -static inline int security_sem_semctl(struct sem_array *sma, int cmd) +static inline int security_sem_semctl(struct sem_array *sma __unused__, int cmd __unused__) { return 0; } -static inline int security_sem_semop(struct sem_array *sma, - struct sembuf *sops, unsigned nsops, - int alter) +static inline int security_sem_semop(struct sem_array *sma __unused__, + struct sembuf *sops __unused__, unsigned nsops __unused__, + int alter __unused__) { return 0; } -static inline void security_d_instantiate(struct dentry *dentry, struct inode *inode) +static inline void security_d_instantiate(struct dentry *dentry __unused__, struct inode *inode __unused__) { } -static inline int security_getprocattr(struct task_struct *p, char *name, char **value) +static inline int security_getprocattr(struct task_struct *p __unused__, char *name __unused__, char **value __unused__) { return -EINVAL; } -static inline int security_setprocattr(struct task_struct *p, char *name, void *value, size_t size) +static inline int security_setprocattr(struct task_struct *p __unused__, char *name __unused__, void *value __unused__, size_t size __unused__) { return -EINVAL; } @@ -2429,19 +2432,19 @@ return cap_netlink_recv(skb, cap); } -static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen) +static inline int security_secid_to_secctx(u32 secid __unused__, char **secdata __unused__, u32 *seclen __unused__) { return -EOPNOTSUPP; } -static inline int security_secctx_to_secid(const char *secdata, - u32 seclen, - u32 *secid) +static inline int security_secctx_to_secid(const char *secdata __unused__, + u32 seclen __unused__, + u32 *secid __unused__) { return -EOPNOTSUPP; } -static inline void security_release_secctx(char *secdata, u32 seclen) +static inline void security_release_secctx(char *secdata __unused__, u32 seclen __unused__) { } #endif /* CONFIG_SECURITY */ @@ -2485,157 +2488,157 @@ struct sk_buff *skb); #else /* CONFIG_SECURITY_NETWORK */ -static inline int security_unix_stream_connect(struct socket *sock, - struct socket *other, - struct sock *newsk) +static inline int security_unix_stream_connect(struct socket *sock __unused__, + struct socket *other __unused__, + struct sock *newsk __unused__) { return 0; } -static inline int security_unix_may_send(struct socket *sock, - struct socket *other) +static inline int security_unix_may_send(struct socket *sock __unused__, + struct socket *other __unused__) { return 0; } -static inline int security_socket_create(int family, int type, - int protocol, int kern) +static inline int security_socket_create(int family __unused__, int type __unused__, + int protocol, int kern __unused__) { return 0; } -static inline int security_socket_post_create(struct socket *sock, - int family, - int type, - int protocol, int kern) +static inline int security_socket_post_create(struct socket *sock __unused__, + int family __unused__, + int type __unused__, + int protocol __unused__, int kern __unused__) { return 0; } -static inline int security_socket_bind(struct socket *sock, - struct sockaddr *address, - int addrlen) +static inline int security_socket_bind(struct socket *sock __unused__, + struct sockaddr *address __unused__, + int addrlen __unused__) { return 0; } -static inline int security_socket_connect(struct socket *sock, - struct sockaddr *address, - int addrlen) +static inline int security_socket_connect(struct socket *sock __unused__, + struct sockaddr *address __unused__, + int addrlen __unused__) { return 0; } -static inline int security_socket_listen(struct socket *sock, int backlog) +static inline int security_socket_listen(struct socket *sock __unused__, int backlog __unused__) { return 0; } -static inline int security_socket_accept(struct socket *sock, - struct socket *newsock) +static inline int security_socket_accept(struct socket *sock __unused__, + struct socket *newsock __unused__) { return 0; } -static inline void security_socket_post_accept(struct socket *sock, - struct socket *newsock) +static inline void security_socket_post_accept(struct socket *sock __unused__, + struct socket *newsock __unused__) { } -static inline int security_socket_sendmsg(struct socket *sock, - struct msghdr *msg, int size) +static inline int security_socket_sendmsg(struct socket *sock __unused__, + struct msghdr *msg __unused__, int size __unused__) { return 0; } -static inline int security_socket_recvmsg(struct socket *sock, - struct msghdr *msg, int size, - int flags) +static inline int security_socket_recvmsg(struct socket *sock __unused__, + struct msghdr *msg __unused__, int size __unused__, + int flags __unused__) { return 0; } -static inline int security_socket_getsockname(struct socket *sock) +static inline int security_socket_getsockname(struct socket *sock __unused__) { return 0; } -static inline int security_socket_getpeername(struct socket *sock) +static inline int security_socket_getpeername(struct socket *sock __unused__) { return 0; } -static inline int security_socket_getsockopt(struct socket *sock, - int level, int optname) +static inline int security_socket_getsockopt(struct socket *sock __unused__, + int level __unused__, int optname __unused__) { return 0; } -static inline int security_socket_setsockopt(struct socket *sock, - int level, int optname) +static inline int security_socket_setsockopt(struct socket *sock __unused__, + int level __unused__, int optname __unused__) { return 0; } -static inline int security_socket_shutdown(struct socket *sock, int how) +static inline int security_socket_shutdown(struct socket *sock __unused__, int how __unused__) { return 0; } -static inline int security_sock_rcv_skb(struct sock *sk, - struct sk_buff *skb) +static inline int security_sock_rcv_skb(struct sock *sk __unused__, + struct sk_buff *skb __unused__) { return 0; } -static inline int security_socket_getpeersec_stream(struct socket *sock, char __user *optval, - int __user *optlen, unsigned len) +static inline int security_socket_getpeersec_stream(struct socket *sock __unused__, char __user *optval __unused__, + int __user *optlen __unused__, unsigned len __unused__) { return -ENOPROTOOPT; } -static inline int security_socket_getpeersec_dgram(struct socket *sock, struct sk_buff *skb, u32 *secid) +static inline int security_socket_getpeersec_dgram(struct socket *sock __unused__, struct sk_buff *skb __unused__, u32 *secid __unused__) { return -ENOPROTOOPT; } -static inline int security_sk_alloc(struct sock *sk, int family, gfp_t priority) +static inline int security_sk_alloc(struct sock *sk, int family __unused__, gfp_t priority __unused__) { return 0; } -static inline void security_sk_free(struct sock *sk) +static inline void security_sk_free(struct sock *sk __unused__) { } -static inline void security_sk_clone(const struct sock *sk, struct sock *newsk) +static inline void security_sk_clone(const struct sock *sk __unused__, struct sock *newsk __unused__) { } -static inline void security_sk_classify_flow(struct sock *sk, struct flowi *fl) +static inline void security_sk_classify_flow(struct sock *sk __unused__, struct flowi *fl __unused__) { } -static inline void security_req_classify_flow(const struct request_sock *req, struct flowi *fl) +static inline void security_req_classify_flow(const struct request_sock *req __unused__, struct flowi *fl __unused__) { } -static inline void security_sock_graft(struct sock *sk, struct socket *parent) +static inline void security_sock_graft(struct sock *sk __unused__, struct socket *parent __unused__) { } -static inline int security_inet_conn_request(struct sock *sk, - struct sk_buff *skb, struct request_sock *req) +static inline int security_inet_conn_request(struct sock *sk __unused__, + struct sk_buff *skb __unused__, struct request_sock *req __unused__) { return 0; } -static inline void security_inet_csk_clone(struct sock *newsk, - const struct request_sock *req) +static inline void security_inet_csk_clone(struct sock *newsk __unused__, + const struct request_sock *req __unused__) { } -static inline void security_inet_conn_established(struct sock *sk, - struct sk_buff *skb) +static inline void security_inet_conn_established(struct sock *sk __unused__, + struct sk_buff *skb __unused__) { } #endif /* CONFIG_SECURITY_NETWORK */ @@ -2659,63 +2662,71 @@ #else /* CONFIG_SECURITY_NETWORK_XFRM */ -static inline int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *sec_ctx) +static inline int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp __attribute__ ((unused)), + struct xfrm_user_sec_ctx *sec_ctx __attribute__ ((unused))) { return 0; } -static inline int security_xfrm_policy_clone(struct xfrm_sec_ctx *old, struct xfrm_sec_ctx **new_ctxp) +static inline int security_xfrm_policy_clone(struct xfrm_sec_ctx *old __attribute__ ((unused)), + struct xfrm_sec_ctx **new_ctxp __attribute__ ((unused))) { return 0; } -static inline void security_xfrm_policy_free(struct xfrm_sec_ctx *ctx) +static inline void security_xfrm_policy_free(struct xfrm_sec_ctx *ctx __attribute__ ((unused))) { } -static inline int security_xfrm_policy_delete(struct xfrm_sec_ctx *ctx) +static inline int security_xfrm_policy_delete(struct xfrm_sec_ctx *ctx __attribute__ ((unused))) { return 0; } -static inline int security_xfrm_state_alloc(struct xfrm_state *x, - struct xfrm_user_sec_ctx *sec_ctx) +static inline int security_xfrm_state_alloc(struct xfrm_state *x __attribute__ ((unused)), + struct xfrm_user_sec_ctx *sec_ctx __attribute__ ((unused))) { return 0; } -static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x, - struct xfrm_sec_ctx *polsec, u32 secid) +static inline int security_xfrm_state_alloc_acquire(struct xfrm_state *x __attribute__ ((unused)), + struct xfrm_sec_ctx *polsec __attribute__ ((unused)), + u32 secid __attribute__ ((unused))) { return 0; } -static inline void security_xfrm_state_free(struct xfrm_state *x) +static inline void security_xfrm_state_free(struct xfrm_state *x __attribute__ ((unused))) { } -static inline int security_xfrm_state_delete(struct xfrm_state *x) +static inline int security_xfrm_state_delete(struct xfrm_state *x __attribute__ ((unused))) { return 0; } -static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir) +static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx __attribute__ ((unused)), + u32 fl_secid __attribute__ ((unused)), + u8 dir __attribute__ ((unused))) { return 0; } -static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x, - struct xfrm_policy *xp, struct flowi *fl) +static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x __attribute__ ((unused)), + struct xfrm_policy *xp __attribute__ ((unused)), + struct flowi *fl __attribute__ ((unused))) { return 1; } -static inline int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid) +static inline int security_xfrm_decode_session(struct sk_buff *skb __attribute__ ((unused)), + u32 *secid __attribute__ ((unused))) { return 0; } -static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl) +static inline void security_skb_classify_flow(struct sk_buff *skb __attribute__ ((unused)), + struct flowi *fl __attribute__ ((unused))) { } @@ -2732,25 +2743,25 @@ #else -static inline int security_key_alloc(struct key *key, - struct task_struct *tsk, - unsigned long flags) +static inline int security_key_alloc(struct key *key __unused__, + struct task_struct *tsk __unused__, + unsigned long flags __unused__) { return 0; } -static inline void security_key_free(struct key *key) +static inline void security_key_free(struct key *key __unused__) { } -static inline int security_key_permission(key_ref_t key_ref, - struct task_struct *context, - key_perm_t perm) +static inline int security_key_permission(key_ref_t key_ref __unused__, + struct task_struct *context __unused__, + key_perm_t perm __unused__) { return 0; } -static inline int security_key_getsecurity(struct key *key, char **_buffer) +static inline int security_key_getsecurity(struct key *key __unused__, char **_buffer) { *_buffer = NULL; return 0; @@ -2769,24 +2780,24 @@ #else -static inline int security_audit_rule_init(u32 field, u32 op, char *rulestr, - void **lsmrule) +static inline int security_audit_rule_init(u32 field __unused__, u32 op __unused__, char *rulestr __unused__, + void **lsmrule __unused__) { return 0; } -static inline int security_audit_rule_known(struct audit_krule *krule) +static inline int security_audit_rule_known(struct audit_krule *krule __unused__) { return 0; } -static inline int security_audit_rule_match(u32 secid, u32 field, u32 op, - void *lsmrule, struct audit_context *actx) +static inline int security_audit_rule_match(u32 secid __unused__, u32 field __unused__, u32 op __unused__, + void *lsmrule __unused__, struct audit_context *actx __unused__) { return 0; } -static inline void security_audit_rule_free(void *lsmrule) +static inline void security_audit_rule_free(void *lsmrule __unused__) { } #endif /* CONFIG_SECURITY */ @@ -2802,22 +2813,22 @@ #else /* CONFIG_SECURITYFS */ -static inline struct dentry *securityfs_create_dir(const char *name, - struct dentry *parent) +static inline struct dentry *securityfs_create_dir(const char *name __attribute__ ((unused)), + struct dentry *parent __attribute__ ((unused))) { return ERR_PTR(-ENODEV); } -static inline struct dentry *securityfs_create_file(const char *name, - mode_t mode, - struct dentry *parent, - void *data, - const struct file_operations *fops) +static inline struct dentry *securityfs_create_file(const char *name __attribute__ ((unused)), + mode_t mode __attribute__ ((unused)), + struct dentry *parent __attribute__ ((unused)), + void *data __attribute__ ((unused)), + const struct file_operations *fops __attribute__ ((unused))) { return ERR_PTR(-ENODEV); } -static inline void securityfs_remove(struct dentry *dentry) +static inline void securityfs_remove(struct dentry *dentry __attribute__ ((unused))) {} #endif