diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /include/linux/fs.h | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 026d3209e..69fa35c3c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -21,7 +21,9 @@ #include <asm/atomic.h> #include <asm/bitops.h> +#include <asm/cache.h> +struct poll_table_struct; /* @@ -38,13 +40,13 @@ #define NR_OPEN 1024 #define NR_SUPER 64 -#define BLOCK_SIZE 1024 #define BLOCK_SIZE_BITS 10 +#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS) /* And dynamically-tunable limits and defaults: */ extern int max_inodes; extern int max_files, nr_files, nr_free_files; -#define NR_INODE 4096 /* This should no longer be bigger than NR_FILE */ + #define NR_FILE 4096 /* this can well be larger on a larger system */ #define NR_RESERVED_FILES 10 /* reserved for root */ @@ -87,7 +89,7 @@ extern int max_files, nr_files, nr_free_files; #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_WRITE 128 /* Write on file/directory/symlink */ +#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. */ @@ -119,7 +121,7 @@ extern int max_files, nr_files, nr_free_files; #define IS_SYNC(inode) ((inode)->i_flags & MS_SYNCHRONOUS) #define IS_MANDLOCK(inode) ((inode)->i_flags & MS_MANDLOCK) -#define IS_WRITABLE(inode) ((inode)->i_flags & S_WRITE) +#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) ((inode)->i_flags & MS_NOATIME) @@ -317,7 +319,11 @@ struct iattr { #define ATTR_FLAG_IMMUTABLE 8 /* Immutable file */ #define ATTR_FLAG_NODIRATIME 16 /* Don't update atime for directory */ +/* + * Includes for diskquotas and mount structures. + */ #include <linux/quota.h> +#include <linux/mount.h> struct inode { struct list_head i_hash; @@ -631,16 +637,17 @@ struct super_operations { int (*statfs) (struct super_block *, struct statfs *, int); int (*remount_fs) (struct super_block *, int *, char *); void (*clear_inode) (struct inode *); + void (*umount_begin) (struct super_block *); }; struct dquot_operations { void (*initialize) (struct inode *, short); void (*drop) (struct inode *); - int (*alloc_block) (const struct inode *, unsigned long); - int (*alloc_inode) (const struct inode *, unsigned long); + int (*alloc_block) (const struct inode *, unsigned long, uid_t, char); + int (*alloc_inode) (const struct inode *, unsigned long, uid_t); void (*free_block) (const struct inode *, unsigned long); void (*free_inode) (const struct inode *, unsigned long); - int (*transfer) (struct inode *, struct iattr *, char); + int (*transfer) (struct inode *, struct iattr *, char, uid_t); }; struct file_system_type { |