diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/mmu_context.h | 6 | ||||
| -rw-r--r-- | include/linux/fs.h | 1 | ||||
| -rw-r--r-- | include/linux/gameport.h | 4 | ||||
| -rw-r--r-- | include/linux/genhd.h | 44 | ||||
| -rw-r--r-- | include/linux/module.h | 6 | ||||
| -rw-r--r-- | include/linux/smb_fs.h | 78 | ||||
| -rw-r--r-- | include/linux/smbno.h | 7 | ||||
| -rw-r--r-- | include/linux/spinlock.h | 3 |
8 files changed, 39 insertions, 110 deletions
diff --git a/include/asm-ppc/mmu_context.h b/include/asm-ppc/mmu_context.h index 7624088c38d5..58b4d6179855 100644 --- a/include/asm-ppc/mmu_context.h +++ b/include/asm-ppc/mmu_context.h @@ -1,5 +1,5 @@ /* - * BK Id: SCCS/s.mmu_context.h 1.15 08/16/01 23:00:17 paulus + * BK Id: SCCS/s.mmu_context.h 1.18 09/26/01 16:02:49 paulus */ #ifdef __KERNEL__ #ifndef __PPC_MMU_CONTEXT_H @@ -29,7 +29,7 @@ * of the 32-bit virtual address (the "effective segment ID") in order * to spread out the entries in the MMU hash table. Note, if this * function is changed then arch/ppc/mm/hashtable.S will have to be - * changed correspondly. + * changed to correspond. */ #define CTX_TO_VSID(ctx, va) (((ctx) * (897 * 16) + ((va) >> 28) * 0x111) \ & 0xffffff) @@ -89,7 +89,7 @@ extern void set_context(mm_context_t context, pgd_t *pgd); * Bitmap of contexts in use. * The size of this bitmap is LAST_CONTEXT + 1 bits. */ -extern unsigned long context_map[(LAST_CONTEXT+1) / (8*sizeof(unsigned long))]; +extern unsigned long context_map[]; /* * This caches the next context number that we expect to be free. diff --git a/include/linux/fs.h b/include/linux/fs.h index 9d04f9af4908..9d314051fb0b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -650,6 +650,7 @@ struct quota_mount_options */ #define MNT_FORCE 0x00000001 /* Attempt to forcibily umount */ +#define MNT_DETACH 0x00000002 /* Just detach from the tree */ #include <linux/minix_fs_sb.h> #include <linux/ext2_fs_sb.h> diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 4e341f1fdbe9..37b72807182b 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h @@ -74,8 +74,8 @@ void gameport_rescan(struct gameport *gameport); void gameport_register_port(struct gameport *gameport); void gameport_unregister_port(struct gameport *gameport); #else -void __inline__ gameport_register_port(struct gameport *gameport) { return; } -void __inline__ gameport_unregister_port(struct gameport *gameport) { return; } +static void __inline__ gameport_register_port(struct gameport *gameport) { return; } +static void __inline__ gameport_unregister_port(struct gameport *gameport) { return; } #endif void gameport_register_device(struct gameport_dev *dev); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 7aea8bc88b32..a356cb65a4ac 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -13,23 +13,33 @@ #include <linux/types.h> #include <linux/major.h> +enum { /* These three have identical behaviour; use the second one if DOS fdisk gets confused about extended/logical partitions starting past cylinder 1023. */ -#define DOS_EXTENDED_PARTITION 5 -#define LINUX_EXTENDED_PARTITION 0x85 -#define WIN98_EXTENDED_PARTITION 0x0f + DOS_EXTENDED_PARTITION = 5, + LINUX_EXTENDED_PARTITION = 0x85, + WIN98_EXTENDED_PARTITION = 0x0f, -#define LINUX_SWAP_PARTITION 0x82 -#define LINUX_RAID_PARTITION 0xfd /* autodetect RAID partition */ + LINUX_SWAP_PARTITION = 0x82, + LINUX_RAID_PARTITION = 0xfd, /* autodetect RAID partition */ -#ifdef CONFIG_SOLARIS_X86_PARTITION -#define SOLARIS_X86_PARTITION LINUX_SWAP_PARTITION -#endif + SOLARIS_X86_PARTITION = LINUX_SWAP_PARTITION, -#define DM6_PARTITION 0x54 /* has DDO: use xlated geom & offset */ -#define EZD_PARTITION 0x55 /* EZ-DRIVE */ -#define DM6_AUX1PARTITION 0x51 /* no DDO: use xlated geom */ -#define DM6_AUX3PARTITION 0x53 /* no DDO: use xlated geom */ + DM6_PARTITION = 0x54, /* has DDO: use xlated geom & offset */ + EZD_PARTITION = 0x55, /* EZ-DRIVE */ + DM6_AUX1PARTITION = 0x51, /* no DDO: use xlated geom */ + DM6_AUX3PARTITION = 0x53, /* no DDO: use xlated geom */ + + FREEBSD_PARTITION = 0xa5, /* FreeBSD Partition ID */ + OPENBSD_PARTITION = 0xa6, /* OpenBSD Partition ID */ + NETBSD_PARTITION = 0xa9, /* NetBSD Partition ID */ + BSDI_PARTITION = 0xb7, /* BSDI Partition ID */ +/* Ours is not to wonder why.. */ + BSD_PARTITION = FREEBSD_PARTITION, + MINIX_PARTITION = 0x81, /* Minix Partition ID */ + UNIXWARE_PARTITION = 0x63, /* Partition ID, same as */ + /* GNU_HURD and SCO Unix */ +}; struct partition { unsigned char boot_ind; /* 0x80 - active */ @@ -117,13 +127,6 @@ struct solaris_x86_vtoc { * BSD disklabel support by Yossi Gottlieb <yogo@math.tau.ac.il> * updated by Marc Espie <Marc.Espie@openbsd.org> */ -#define FREEBSD_PARTITION 0xa5 /* FreeBSD Partition ID */ -#define OPENBSD_PARTITION 0xa6 /* OpenBSD Partition ID */ -#define NETBSD_PARTITION 0xa9 /* NetBSD Partition ID */ -#define BSDI_PARTITION 0xb7 /* BSDI Partition ID */ - -/* Ours is not to wonder why.. */ -#define BSD_PARTITION FREEBSD_PARTITION /* check against BSD src/sys/sys/disklabel.h for consistency */ @@ -182,8 +185,6 @@ struct bsd_disklabel { * and Krzysztof G. Baranowski <kgb@knm.org.pl> */ -#define UNIXWARE_PARTITION 0x63 /* Partition ID, same as */ - /* GNU_HURD and SCO Unix */ #define UNIXWARE_DISKMAGIC (0xCA5E600DUL) /* The disk magic number */ #define UNIXWARE_DISKMAGIC2 (0x600DDEEEUL) /* The slice table magic nr */ #define UNIXWARE_NUMSLICE 16 @@ -233,7 +234,6 @@ struct unixware_disklabel { #endif /* CONFIG_UNIXWARE_DISKLABEL */ #ifdef CONFIG_MINIX_SUBPARTITION -# define MINIX_PARTITION 0x81 /* Minix Partition ID */ # define MINIX_NR_SUBPARTITIONS 4 #endif /* CONFIG_MINIX_SUBPARTITION */ diff --git a/include/linux/module.h b/include/linux/module.h index d32bf62b8fb0..becc3a0e48c8 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -366,10 +366,10 @@ __attribute__((section("__ksymtab"))) = \ #define __EXPORT_SYMBOL_GPL(sym, str) \ const char __kstrtab_##sym[] \ -__attribute__((section(".kstrtab"))) = str; \ -const struct module_symbol __ksymtab_GPLONLY_##sym \ +__attribute__((section(".kstrtab"))) = "GPLONLY_" str; \ +const struct module_symbol __ksymtab_##sym \ __attribute__((section("__ksymtab"))) = \ -{ (unsigned long)&sym, __kstrtab_GPLONLY_##sym } +{ (unsigned long)&sym, __kstrtab_##sym } #if defined(MODVERSIONS) || !defined(CONFIG_MODVERSIONS) #define EXPORT_SYMBOL(var) __EXPORT_SYMBOL(var, __MODULE_STRING(var)) diff --git a/include/linux/smb_fs.h b/include/linux/smb_fs.h index 716e50ec65f9..2200209882ec 100644 --- a/include/linux/smb_fs.h +++ b/include/linux/smb_fs.h @@ -161,84 +161,6 @@ smb_is_open(struct inode *i) } -/* FIXME! the prototype list is probably not correct. Automate? */ - -/* linux/fs/smbfs/file.c */ -extern struct inode_operations smb_file_inode_operations; -extern struct file_operations smb_file_operations; -extern struct address_space_operations smb_file_aops; - -/* linux/fs/smbfs/dir.c */ -extern struct inode_operations smb_dir_inode_operations; -extern struct file_operations smb_dir_operations; -void smb_new_dentry(struct dentry *dentry); -void smb_renew_times(struct dentry *); - -/* linux/fs/smbfs/ioctl.c */ -int smb_ioctl (struct inode *, struct file *, unsigned int, unsigned long); - -/* linux/fs/smbfs/inode.c */ -struct super_block *smb_read_super(struct super_block *, void *, int); -void smb_get_inode_attr(struct inode *, struct smb_fattr *); -void smb_set_inode_attr(struct inode *, struct smb_fattr *); -void smb_invalidate_inodes(struct smb_sb_info *); -int smb_revalidate_inode(struct dentry *); -int smb_notify_change(struct dentry *, struct iattr *); -struct inode *smb_iget(struct super_block *, struct smb_fattr *); - -/* linux/fs/smbfs/proc.c */ -int smb_setcodepage(struct smb_sb_info *server, struct smb_nls_codepage *cp); -__u32 smb_len(unsigned char *); -__u8 *smb_setup_header(struct smb_sb_info *, __u8, __u16, __u16); -int smb_get_rsize(struct smb_sb_info *); -int smb_get_wsize(struct smb_sb_info *); -int smb_newconn(struct smb_sb_info *, struct smb_conn_opt *); -int smb_errno(struct smb_sb_info *); -int smb_close(struct inode *); -int smb_close_fileid(struct dentry *, __u16); -int smb_open(struct dentry *, int); -int smb_proc_read(struct inode *, off_t, int, char *); -int smb_proc_write(struct inode *, off_t, int, const char *); -int smb_proc_create(struct dentry *, __u16, time_t, __u16 *); -int smb_proc_mv(struct dentry *, struct dentry *); -int smb_proc_mkdir(struct dentry *); -int smb_proc_rmdir(struct dentry *); -int smb_proc_unlink(struct dentry *); -int smb_proc_readdir(struct file *filp, void *dirent, filldir_t filldir, - struct smb_cache_control *ctl); -int smb_proc_getattr(struct dentry *, struct smb_fattr *); -int smb_proc_setattr(struct dentry *, struct smb_fattr *); -int smb_proc_settime(struct dentry *, struct smb_fattr *); -int smb_proc_dskattr(struct super_block *, struct statfs *); -int smb_proc_disconnect(struct smb_sb_info *); -int smb_proc_trunc(struct smb_sb_info *, __u16, __u32); -int smb_proc_flush(struct smb_sb_info *, __u16); -void smb_init_root_dirent(struct smb_sb_info *, struct smb_fattr *); - -/* linux/fs/smbfs/sock.c */ -int smb_round_length(int); -int smb_valid_socket(struct inode *); -void smb_close_socket(struct smb_sb_info *); -int smb_request(struct smb_sb_info *server); -int smb_catch_keepalive(struct smb_sb_info *server); -int smb_dont_catch_keepalive(struct smb_sb_info *server); -int smb_trans2_request(struct smb_sb_info *server, __u16 trans2_command, - int ldata, unsigned char *data, - int lparam, unsigned char *param, - int *lrdata, unsigned char **rdata, - int *lrparam, unsigned char **rparam); - -/* fs/smbfs/cache.c */ - -void smb_invalid_dir_cache(struct inode * dir); -void smb_invalidate_dircache_entries(struct dentry *parent); -struct dentry * smb_dget_fpos(struct dentry *dentry, struct dentry *parent, - unsigned long fpos); -int smb_fill_cache(struct file *filp, void *dirent, filldir_t filldir, - struct smb_cache_control *ctrl, struct qstr *qname, - struct smb_fattr *entry); - - #endif /* __KERNEL__ */ #endif /* _LINUX_SMB_FS_H */ diff --git a/include/linux/smbno.h b/include/linux/smbno.h index 0f25e0265393..aa5ac336c8cf 100644 --- a/include/linux/smbno.h +++ b/include/linux/smbno.h @@ -39,7 +39,12 @@ #define ERRbadshare 32 /* Share mode on file conflict with open mode */ #define ERRlock 33 /* Lock request conflicts with existing lock */ #define ERRfilexists 80 /* File in operation already exists */ -#define ERRundocumented1 123 /* Invalid name?? e.g. .tmp* */ +#define ERRinvalidparam 87 /* ERROR_INVALID_PARAMETER */ +#define ERRdiskfull 112 /* ERROR_DISK_FULL */ +#define ERRinvalidname 123 /* ERROR_INVALID_NAME */ +#define ERRdirnotempty 145 /* ERROR_DIR_NOT_EMPTY */ +#define ERRnotlocked 158 /* ERROR_NOT_LOCKED */ +#define ERRexists 183 /* ERROR_ALREADY_EXISTS, see also 80 */ #define ERRbadpipe 230 /* Named pipe invalid */ #define ERRpipebusy 231 /* All instances of pipe are busy */ #define ERRpipeclosing 232 /* named pipe close in progress */ diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 1d49bb8e265a..059329c7759e 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -42,6 +42,7 @@ #if (DEBUG_SPINLOCKS < 1) #define atomic_dec_and_lock(atomic,lock) atomic_dec_and_test(atomic) +#define ATOMIC_DEC_AND_LOCK /* * Your basic spinlocks, allowing only a single CPU anywhere @@ -128,7 +129,7 @@ typedef struct { #endif /* !SMP */ /* "lock on reference count zero" */ -#ifndef atomic_dec_and_lock +#ifndef ATOMIC_DEC_AND_LOCK #include <asm/atomic.h> extern int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock); #endif |