diff options
| author | Andrew Morton <akpm@digeo.com> | 2003-05-07 08:15:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-07 08:15:36 -0700 |
| commit | b7bd1dee9cecddb692740a236f14d6769172acbf (patch) | |
| tree | 10b33d375642914c3a5ece4ef30cbba468fd5db9 /include | |
| parent | 862fb2829261c21f53e9bcd843c801d4781512a8 (diff) | |
[PATCH] sysrq-S, sysrq-U cleanups
From: Christoph Hellwig <hch@lst.de>
Change sysrq sync/remount from a magic bdflush hook to proper pdflush
operations. The sync operation reuses most of the regular sys_sync path now
instead of implementing it's own superblock walking and (broken) local disk
detection, the remount implementation has been moved to super.c, cleaned up
and updated for the last two years locking changes. It also shares some code
with the regular remount path now.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 4 | ||||
| -rw-r--r-- | include/linux/sysrq.h | 18 |
2 files changed, 4 insertions, 18 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index b9b2cf5b69e8..370c6f0b4fe3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1113,6 +1113,10 @@ extern int filemap_flush(struct address_space *); extern int filemap_fdatawait(struct address_space *); extern void sync_supers(void); extern void sync_filesystems(int wait); +extern void emergency_sync(void); +extern void emergency_remount(void); +extern int do_remount_sb(struct super_block *sb, int flags, + void *data, int force); extern sector_t bmap(struct inode *, sector_t); extern int setattr_mask(unsigned int); extern int notify_change(struct dentry *, struct iattr *); diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h index ee340cd26eaf..1acdb0bd4689 100644 --- a/include/linux/sysrq.h +++ b/include/linux/sysrq.h @@ -92,21 +92,3 @@ static inline int __reterr(void) #define unregister_sysrq_key(ig,nore) __reterr() #endif - - -/* Deferred actions */ - -extern int emergency_sync_scheduled; - -#define EMERG_SYNC 1 -#define EMERG_REMOUNT 2 - -void do_emergency_sync(void); - -#ifdef CONFIG_MAGIC_SYSRQ -#define CHECK_EMERGENCY_SYNC \ - if (emergency_sync_scheduled) \ - do_emergency_sync(); -#else -#define CHECK_EMERGENCY_SYNC -#endif |