summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-alpha/fpu.h2
-rw-r--r--include/asm-arm/stat.h6
-rw-r--r--include/asm-i386/stat.h7
-rw-r--r--include/asm-i386/system.h3
-rw-r--r--include/asm-ia64/system.h1
-rw-r--r--include/asm-m68k/stat.h5
-rw-r--r--include/asm-m68k/system.h3
-rw-r--r--include/asm-mips/system.h3
-rw-r--r--include/asm-mips64/system.h3
-rw-r--r--include/asm-ppc/stat.h3
-rw-r--r--include/asm-ppc/system.h1
-rw-r--r--include/asm-s390/stat.h4
-rw-r--r--include/asm-s390/system.h1
-rw-r--r--include/asm-sh/system.h3
-rw-r--r--include/asm-sparc/stat.h4
-rw-r--r--include/asm-sparc/system.h1
-rw-r--r--include/asm-sparc64/stat.h4
-rw-r--r--include/asm-sparc64/system.h2
-rw-r--r--include/linux/fs.h29
-rw-r--r--include/linux/list.h11
-rw-r--r--include/linux/sysrq.h2
-rw-r--r--include/linux/umsdos_fs.p3
-rw-r--r--include/linux/usb.h1
23 files changed, 50 insertions, 52 deletions
diff --git a/include/asm-alpha/fpu.h b/include/asm-alpha/fpu.h
index b9d8faa61..b02a78594 100644
--- a/include/asm-alpha/fpu.h
+++ b/include/asm-alpha/fpu.h
@@ -153,7 +153,7 @@ wrfpcr(unsigned long val)
unsigned long tmp;
#if defined(__alpha_cix__) || defined(__alpha_fix__)
- __asm__ ("ftoit $f0,%0\n\t"
+ __asm__ __volatile__ ("ftoit $f0,%0\n\t"
"itoft %1,$f0\n\t"
"mt_fpcr $f0\n\t"
"itoft %0,$f0"
diff --git a/include/asm-arm/stat.h b/include/asm-arm/stat.h
index 5346b0223..77a16fa5c 100644
--- a/include/asm-arm/stat.h
+++ b/include/asm-arm/stat.h
@@ -45,7 +45,8 @@ struct stat64 {
unsigned short st_dev;
unsigned char __pad0[10];
- unsigned long st_ino;
+#define STAT64_HAS_BROKEN_ST_INO 1
+ unsigned long __st_ino;
unsigned int st_mode;
unsigned int st_nlink;
@@ -70,8 +71,7 @@ struct stat64 {
unsigned long st_ctime;
unsigned long __pad7; /* will be high 32 bits of ctime someday */
- unsigned long __unused1;
- unsigned long __unused2;
+ unsigned long long st_ino;
};
#endif
diff --git a/include/asm-i386/stat.h b/include/asm-i386/stat.h
index cb2fa6f4d..ef16311fe 100644
--- a/include/asm-i386/stat.h
+++ b/include/asm-i386/stat.h
@@ -45,7 +45,9 @@ struct stat64 {
unsigned short st_dev;
unsigned char __pad0[10];
- unsigned long st_ino;
+#define STAT64_HAS_BROKEN_ST_INO 1
+ unsigned long __st_ino;
+
unsigned int st_mode;
unsigned int st_nlink;
@@ -70,8 +72,7 @@ struct stat64 {
unsigned long st_ctime;
unsigned long __pad7; /* will be high 32 bits of ctime someday */
- unsigned long __unused1;
- unsigned long __unused2;
+ unsigned long long st_ino;
};
#endif
diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index ec9f33ba6..563e53b77 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -271,8 +271,7 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
#define mb() __asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory")
#define rmb() mb()
#define wmb() __asm__ __volatile__ ("": : :"memory")
-#define set_rmb(var, value) do { xchg(&var, value); } while (0)
-#define set_mb(var, value) set_rmb(var, value)
+#define set_mb(var, value) do { xchg(&var, value); } while (0)
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
/* interrupt control.. */
diff --git a/include/asm-ia64/system.h b/include/asm-ia64/system.h
index 689be6df6..abffefa01 100644
--- a/include/asm-ia64/system.h
+++ b/include/asm-ia64/system.h
@@ -96,7 +96,6 @@ ia64_insn_group_barrier (void)
* Linus just yet. Grrr...
*/
#define set_mb(var, value) do { (var) = (value); mb(); } while (0)
-#define set_rmb(var, value) do { (var) = (value); mb(); } while (0)
#define set_wmb(var, value) do { (var) = (value); mb(); } while (0)
/*
diff --git a/include/asm-m68k/stat.h b/include/asm-m68k/stat.h
index b28ce37c5..1d5b008e0 100644
--- a/include/asm-m68k/stat.h
+++ b/include/asm-m68k/stat.h
@@ -42,10 +42,11 @@ struct stat {
* insane amounts of padding around dev_t's.
*/
struct stat64 {
+ unsigned char __pad0[6];
unsigned short st_dev;
- unsigned char __pad0[10];
- unsigned long st_ino;
+ unsigned long long st_ino;
+
unsigned int st_mode;
unsigned int st_nlink;
diff --git a/include/asm-m68k/system.h b/include/asm-m68k/system.h
index 7b6ae7d16..64dab98d8 100644
--- a/include/asm-m68k/system.h
+++ b/include/asm-m68k/system.h
@@ -80,8 +80,7 @@ asmlinkage void resume(void);
#define mb() asm volatile ("" : : :"memory")
#define rmb() asm volatile ("" : : :"memory")
#define wmb() asm volatile ("" : : :"memory")
-#define set_rmb(var, value) do { xchg(&var, value); } while (0)
-#define set_mb(var, value) set_rmb(var, value)
+#define set_mb(var, value) do { xchg(&var, value); } while (0)
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index 91a7b05fb..c057c0925 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -153,9 +153,6 @@ __asm__ __volatile__( \
#define set_mb(var, value) \
do { var = value; mb(); } while (0)
-#define set_rmb(var, value) \
-do { var = value; rmb(); } while (0)
-
#define set_wmb(var, value) \
do { var = value; wmb(); } while (0)
diff --git a/include/asm-mips64/system.h b/include/asm-mips64/system.h
index 47e90aec4..4b9d9f551 100644
--- a/include/asm-mips64/system.h
+++ b/include/asm-mips64/system.h
@@ -154,9 +154,6 @@ __asm__ __volatile__( \
#define set_mb(var, value) \
do { var = value; mb(); } while (0)
-#define set_rmb(var, value) \
-do { var = value; rmb(); } while (0)
-
#define set_wmb(var, value) \
do { var = value; wmb(); } while (0)
diff --git a/include/asm-ppc/stat.h b/include/asm-ppc/stat.h
index 538da77bb..204b07e6e 100644
--- a/include/asm-ppc/stat.h
+++ b/include/asm-ppc/stat.h
@@ -42,8 +42,7 @@ struct stat {
*/
struct stat64 {
unsigned long long st_dev; /* Device. */
- unsigned short int __pad1;
- unsigned long st_ino; /* File serial number. */
+ unsigned long long st_ino; /* File serial number. */
unsigned int st_mode; /* File mode. */
unsigned int st_nlink; /* Link count. */
unsigned int st_uid; /* User ID of the file's owner. */
diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h
index 162a09a1d..153e1c49d 100644
--- a/include/asm-ppc/system.h
+++ b/include/asm-ppc/system.h
@@ -34,7 +34,6 @@
#define wmb() __asm__ __volatile__ ("eieio" : : : "memory")
#define set_mb(var, value) do { var = value; mb(); } while (0)
-#define set_rmb(var, value) do { var = value; rmb(); } while (0)
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
extern void xmon_irq(int, void *, struct pt_regs *);
diff --git a/include/asm-s390/stat.h b/include/asm-s390/stat.h
index e3e5907e9..be52ef679 100644
--- a/include/asm-s390/stat.h
+++ b/include/asm-s390/stat.h
@@ -51,9 +51,9 @@ struct stat {
*/
struct stat64 {
unsigned short st_dev;
- unsigned char __pad0[10];
+ unsigned char __pad0[6];
- unsigned long st_ino;
+ unsigned long long st_ino;
unsigned int st_mode;
unsigned int st_nlink;
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index 26910ac1f..afced6af1 100644
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
@@ -117,7 +117,6 @@ static inline unsigned long __xchg(unsigned long x, void * ptr, int size)
#define wmb() eieio()
#define set_mb(var, value) do { var = value; mb(); } while (0)
-#define set_rmb(var, value) do { var = value; rmb(); } while (0)
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
/* interrupt control.. */
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index 3bb876274..c3ca3b467 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -88,8 +88,7 @@ extern void __xchg_called_with_bad_pointer(void);
#define mb() __asm__ __volatile__ ("": : :"memory")
#define rmb() mb()
#define wmb() __asm__ __volatile__ ("": : :"memory")
-#define set_rmb(var, value) do { xchg(&var, value); } while (0)
-#define set_mb(var, value) set_rmb(var, value)
+#define set_mb(var, value) do { xchg(&var, value); } while (0)
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
/* Interrupt Control */
diff --git a/include/asm-sparc/stat.h b/include/asm-sparc/stat.h
index 4b0dd7fa4..a70d4df3c 100644
--- a/include/asm-sparc/stat.h
+++ b/include/asm-sparc/stat.h
@@ -41,9 +41,9 @@ struct stat {
struct stat64 {
unsigned char __pad0[6];
unsigned short st_dev;
- unsigned char __pad1[4];
- unsigned int st_ino;
+ unsigned long long st_ino;
+
unsigned int st_mode;
unsigned int st_nlink;
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h
index 69cc06de2..4174294ca 100644
--- a/include/asm-sparc/system.h
+++ b/include/asm-sparc/system.h
@@ -279,7 +279,6 @@ extern void __global_restore_flags(unsigned long flags);
#define rmb() mb()
#define wmb() mb()
#define set_mb(__var, __value) do { __var = __value; mb(); } while(0)
-#define set_rmb(__var, __value) set_mb(__var, __value)
#define set_wmb(__var, __value) set_mb(__var, __value)
#define nop() __asm__ __volatile__ ("nop");
diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h
index 0fd68589b..4a4fabac0 100644
--- a/include/asm-sparc64/stat.h
+++ b/include/asm-sparc64/stat.h
@@ -48,9 +48,9 @@ struct stat {
struct stat64 {
unsigned char __pad0[6];
unsigned short st_dev;
- unsigned char __pad1[4];
- unsigned int st_ino;
+ unsigned long long st_ino;
+
unsigned int st_mode;
unsigned int st_nlink;
diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h
index 257bca48d..cf5cd0b02 100644
--- a/include/asm-sparc64/system.h
+++ b/include/asm-sparc64/system.h
@@ -104,8 +104,6 @@ extern void __global_restore_flags(unsigned long flags);
#define wmb() membar("#StoreLoad | #StoreStore")
#define set_mb(__var, __value) \
do { __var = __value; membar("#StoreLoad | #StoreStore"); } while(0)
-#define set_rmb(__var, __value) \
- do { __var = __value; membar("#StoreLoad"); } while(0)
#define set_wmb(__var, __value) \
do { __var = __value; membar("#StoreStore"); } while(0)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a33f33768..d0e5c6267 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -91,6 +91,9 @@ extern int max_super_blocks, nr_super_blocks;
*/
#define FS_NOMOUNT 16 /* Never mount from userland */
#define FS_LITTER 32 /* Keeps the tree in dcache */
+#define FS_ODD_RENAME 32768 /* Temporary stuff; will go away as soon
+ * as nfs_rename() will be cleaned up
+ */
/*
* These are the fs-independent mount-flags: up to 16 flags are supported
*/
@@ -101,17 +104,9 @@ extern int max_super_blocks, nr_super_blocks;
#define MS_SYNCHRONOUS 16 /* Writes are synced at once */
#define MS_REMOUNT 32 /* Alter flags of a mounted FS */
#define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */
-#define S_QUOTA 128 /* Quota initialized for file/directory/symlink */
-#define S_APPEND 256 /* Append-only file */
-#define S_IMMUTABLE 512 /* Immutable file */
#define MS_NOATIME 1024 /* Do not update access times. */
#define MS_NODIRATIME 2048 /* Do not update directory access times */
-#define MS_ODD_RENAME 32768 /* Temporary stuff; will go away as soon
- * as nfs_rename() will be cleaned up
- */
-#define S_DEAD (1<<16) /* removed, but still open directory */
-
/*
* Flags that can be altered by MS_REMOUNT
*/
@@ -124,6 +119,15 @@ extern int max_super_blocks, nr_super_blocks;
#define MS_MGC_VAL 0xC0ED0000 /* magic flag number to indicate "new" flags */
#define MS_MGC_MSK 0xffff0000 /* magic flag number mask */
+/* Inode flags - they have nothing to superblock flags now */
+
+#define S_SYNC 1 /* Writes are synced at once */
+#define S_NOATIME 2 /* Do not update access times */
+#define S_QUOTA 4 /* Quota initialized for file */
+#define S_APPEND 8 /* Append-only file */
+#define S_IMMUTABLE 16 /* Immutable file */
+#define S_DEAD 32 /* removed, but still open directory */
+
/*
* Note that nosuid etc flags are inode-specific: setting some file-system
* flags just means all the inodes inherit those flags by default. It might be
@@ -137,20 +141,19 @@ extern int max_super_blocks, nr_super_blocks;
* i_flags updated. Hence, i_flags no longer inherit the superblock mount
* flags, so these have to be checked separately. -- rmk@arm.uk.linux.org
*/
-#define __IS_FLG(inode,flg) (((inode)->i_sb && (inode)->i_sb->s_flags & (flg)) \
- || (inode)->i_flags & (flg))
+#define __IS_FLG(inode,flg) ((inode)->i_sb->s_flags & (flg))
-#define IS_RDONLY(inode) (((inode)->i_sb) && ((inode)->i_sb->s_flags & MS_RDONLY))
+#define IS_RDONLY(inode) ((inode)->i_sb->s_flags & MS_RDONLY)
#define IS_NOSUID(inode) __IS_FLG(inode, MS_NOSUID)
#define IS_NODEV(inode) __IS_FLG(inode, MS_NODEV)
#define IS_NOEXEC(inode) __IS_FLG(inode, MS_NOEXEC)
-#define IS_SYNC(inode) __IS_FLG(inode, MS_SYNCHRONOUS)
+#define IS_SYNC(inode) (__IS_FLG(inode, MS_SYNCHRONOUS) || ((inode)->i_flags & S_SYNC))
#define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK)
#define IS_QUOTAINIT(inode) ((inode)->i_flags & S_QUOTA)
#define IS_APPEND(inode) ((inode)->i_flags & S_APPEND)
#define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE)
-#define IS_NOATIME(inode) __IS_FLG(inode, MS_NOATIME)
+#define IS_NOATIME(inode) (__IS_FLG(inode, MS_NOATIME) || ((inode)->i_flags & S_NOATIME))
#define IS_NODIRATIME(inode) __IS_FLG(inode, MS_NODIRATIME)
#define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD)
diff --git a/include/linux/list.h b/include/linux/list.h
index 4fbe523ab..99ab9c44e 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -85,6 +85,7 @@ static __inline__ void __list_del(struct list_head * prev,
/**
* list_del - deletes entry from list.
* @entry: the element to delete from the list.
+ * Note: list_empty on entry does not return true after this, the entry is in an undefined state.
*/
static __inline__ void list_del(struct list_head *entry)
{
@@ -92,6 +93,16 @@ static __inline__ void list_del(struct list_head *entry)
}
/**
+ * list_del_init - deletes entry from list and reinitialize it.
+ * @entry: the element to delete from the list.n
+ */
+static __inline__ void list_del_init(struct list_head *entry)
+{
+ __list_del(entry->prev, entry->next);
+ INIT_LIST_HEAD(entry);
+}
+
+/**
* list_empty - tests whether a list is empty
* @head: the list to test.
*/
diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
index 6c080adba..e630aba70 100644
--- a/include/linux/sysrq.h
+++ b/include/linux/sysrq.h
@@ -36,5 +36,3 @@ void do_emergency_sync(void);
#else
#define CHECK_EMERGENCY_SYNC
#endif
-
-extern int sysrq_enabled;
diff --git a/include/linux/umsdos_fs.p b/include/linux/umsdos_fs.p
index 93ad4d11d..2752cb004 100644
--- a/include/linux/umsdos_fs.p
+++ b/include/linux/umsdos_fs.p
@@ -26,6 +26,7 @@ int umsdos_newhidden (struct dentry *, struct umsdos_info *);
int umsdos_delentry (struct dentry *, struct umsdos_info *, int);
int umsdos_findentry (struct dentry *, struct umsdos_info *, int);
int umsdos_isempty (struct dentry *);
+int umsdos_writeentry (struct dentry *, struct umsdos_info *, int);
/* file.c 25/01/95 02.25.38 */
@@ -36,7 +37,7 @@ void UMSDOS_write_inode (struct inode *, int);
int UMSDOS_notify_change (struct dentry *, struct iattr *attr);
int umsdos_notify_change_locked(struct dentry *, struct iattr *attr);
void UMSDOS_put_inode (struct inode *);
-int UMSDOS_statfs (struct super_block *, struct statfs *, int);
+int UMSDOS_statfs (struct super_block *, struct statfs *);
struct super_block *UMSDOS_read_super (struct super_block *, void *, int);
void UMSDOS_put_super (struct super_block *);
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 27e6fe7df..b50c5890c 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -576,7 +576,6 @@ extern void usb_release_bandwidth(struct usb_device *dev, struct urb *urb, int i
extern int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, __u16 value, __u16 index, void *data, __u16 size, int timeout);
-extern void usb_init_root_hub(struct usb_device *dev);
extern int usb_root_hub_string(int id, int serial, char *type, __u8 *data, int len);
extern void usb_connect(struct usb_device *dev);
extern void usb_disconnect(struct usb_device **);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 21:19:20 +0000