diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ext3_fs.h | 2 | ||||
| -rw-r--r-- | include/linux/ext3_jbd.h | 12 | ||||
| -rw-r--r-- | include/linux/jbd.h | 28 | ||||
| -rw-r--r-- | include/linux/miscdevice.h | 1 | ||||
| -rw-r--r-- | include/linux/mmzone.h | 3 | ||||
| -rw-r--r-- | include/linux/sched.h | 3 | ||||
| -rw-r--r-- | include/linux/xattr.h | 2 |
7 files changed, 17 insertions, 34 deletions
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index f909a967778e..0612ce8e8274 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h @@ -707,7 +707,7 @@ extern int ext3fs_dirhash(const char *name, int len, struct /* ialloc.c */ extern struct inode * ext3_new_inode (handle_t *, struct inode *, int); extern void ext3_free_inode (handle_t *, struct inode *); -extern struct inode * ext3_orphan_get (struct super_block *, ino_t); +extern struct inode * ext3_orphan_get (struct super_block *, unsigned long); extern unsigned long ext3_count_free_inodes (struct super_block *); extern unsigned long ext3_count_dirs (struct super_block *); extern void ext3_check_inodes_bitmap (struct super_block *); diff --git a/include/linux/ext3_jbd.h b/include/linux/ext3_jbd.h index 1985ecee6a3f..13508f6053b9 100644 --- a/include/linux/ext3_jbd.h +++ b/include/linux/ext3_jbd.h @@ -132,16 +132,6 @@ __ext3_journal_get_write_access(const char *where, return err; } -static inline int -__ext3_journal_dirty_data(const char *where, - handle_t *handle, struct buffer_head *bh, int async) -{ - int err = journal_dirty_data(handle, bh, async); - if (err) - ext3_journal_abort_handle(where, __FUNCTION__, bh, handle,err); - return err; -} - static inline void ext3_journal_forget(handle_t *handle, struct buffer_head *bh) { @@ -183,8 +173,6 @@ __ext3_journal_dirty_metadata(const char *where, __ext3_journal_get_undo_access(__FUNCTION__, (handle), (bh)) #define ext3_journal_get_write_access(handle, bh) \ __ext3_journal_get_write_access(__FUNCTION__, (handle), (bh)) -#define ext3_journal_dirty_data(handle, bh, async) \ - __ext3_journal_dirty_data(__FUNCTION__, (handle), (bh), (async)) #define ext3_journal_revoke(handle, blocknr, bh) \ __ext3_journal_revoke(__FUNCTION__, (handle), (blocknr), (bh)) #define ext3_journal_get_create_access(handle, bh) \ diff --git a/include/linux/jbd.h b/include/linux/jbd.h index f3e44482a298..47a20ce63fa8 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -360,13 +360,6 @@ struct transaction_s */ struct journal_head * t_sync_datalist; - /* - * Doubly-linked circular list of all writepage data buffers - * still to be written before this transaction can be committed. - * Protected by journal_datalist_lock. - */ - struct journal_head * t_async_datalist; - /* Doubly-linked circular list of all forget buffers (superseded buffers which we can un-checkpoint once this transaction commits) */ @@ -654,8 +647,7 @@ extern int journal_extend (handle_t *, int nblocks); extern int journal_get_write_access (handle_t *, struct buffer_head *); extern int journal_get_create_access (handle_t *, struct buffer_head *); extern int journal_get_undo_access (handle_t *, struct buffer_head *); -extern int journal_dirty_data (handle_t *, - struct buffer_head *, int async); +extern int journal_dirty_data (handle_t *, struct buffer_head *); extern int journal_dirty_metadata (handle_t *, struct buffer_head *); extern void journal_release_buffer (handle_t *, struct buffer_head *); extern void journal_forget (handle_t *, struct buffer_head *); @@ -806,14 +798,13 @@ extern int journal_blocks_per_page(struct inode *inode); /* journaling buffer types */ #define BJ_None 0 /* Not journaled */ #define BJ_SyncData 1 /* Normal data: flush before commit */ -#define BJ_AsyncData 2 /* writepage data: wait on it before commit */ -#define BJ_Metadata 3 /* Normal journaled metadata */ -#define BJ_Forget 4 /* Buffer superseded by this transaction */ -#define BJ_IO 5 /* Buffer is for temporary IO use */ -#define BJ_Shadow 6 /* Buffer contents being shadowed to the log */ -#define BJ_LogCtl 7 /* Buffer contains log descriptors */ -#define BJ_Reserved 8 /* Buffer is reserved for access by journal */ -#define BJ_Types 9 +#define BJ_Metadata 2 /* Normal journaled metadata */ +#define BJ_Forget 3 /* Buffer superseded by this transaction */ +#define BJ_IO 4 /* Buffer is for temporary IO use */ +#define BJ_Shadow 5 /* Buffer contents being shadowed to the log */ +#define BJ_LogCtl 6 /* Buffer contains log descriptors */ +#define BJ_Reserved 7 /* Buffer is reserved for access by journal */ +#define BJ_Types 8 extern int jbd_blocks_per_page(struct inode *inode); @@ -860,8 +851,7 @@ static inline int buffer_jdirty(struct buffer_head *bh) static inline int buffer_jbd_data(struct buffer_head *bh) { return SPLICE_LOCK(buffer_jbd(bh), - bh2jh(bh)->b_jlist == BJ_SyncData || - bh2jh(bh)->b_jlist == BJ_AsyncData); + bh2jh(bh)->b_jlist == BJ_SyncData); } #ifdef CONFIG_SMP diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 396d4178b14c..b7b3da409f8a 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@ -18,6 +18,7 @@ #define RTC_MINOR 135 #define EFI_RTC_MINOR 136 /* EFI Time services */ #define SUN_OPENPROM_MINOR 139 +#define DMAPI_MINOR 140 /* DMAPI */ #define NVRAM_MINOR 144 #define I2O_MINOR 166 #define MICROCODE_MINOR 184 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 14ce2049de71..bcb57ed21a8d 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -193,7 +193,8 @@ typedef struct pglist_data { extern int numnodes; extern struct pglist_data *pgdat_list; -void get_zone_counts(unsigned long *active, unsigned long *inactive); +void get_zone_counts(unsigned long *active, unsigned long *inactive, + unsigned long *free); void build_all_zonelists(void); void wakeup_kswapd(struct zone *zone); diff --git a/include/linux/sched.h b/include/linux/sched.h index 1295d071376a..931cdf559eb2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -27,6 +27,7 @@ #include <linux/compiler.h> #include <linux/completion.h> #include <linux/pid.h> +#include <linux/percpu.h> struct exec_domain; @@ -87,6 +88,8 @@ extern unsigned long avenrun[]; /* Load averages */ extern int nr_threads; extern int last_pid; +DECLARE_PER_CPU(unsigned long, process_counts); +extern int nr_processes(void); extern unsigned long nr_running(void); extern unsigned long nr_uninterruptible(void); extern unsigned long nr_iowait(void); diff --git a/include/linux/xattr.h b/include/linux/xattr.h index a7eb1b4188bd..9e967b58ee2e 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -4,7 +4,7 @@ Extended attributes handling. Copyright (C) 2001 by Andreas Gruenbacher <a.gruenbacher@computer.org> - Copyright (C) 2001 SGI - Silicon Graphics, Inc <linux-xfs@oss.sgi.com> + Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. */ #ifndef _LINUX_XATTR_H #define _LINUX_XATTR_H |