diff options
| author | Oleg Drokin <green@angband.namesys.com> | 2002-06-06 17:45:43 +0400 |
|---|---|---|
| committer | Oleg Drokin <green@angband.namesys.com> | 2002-06-06 17:45:43 +0400 |
| commit | 556a2071e454ca342f4caeb9964f7bb28552be21 (patch) | |
| tree | 54eebe98464fae6b34f9763869319b116d55cc45 /include/linux | |
| parent | 7bbbc1b5a05a37e4c64f59c1c1f88e088ef3861e (diff) | |
| parent | 50da7d0e7884c4ff01ab8aa9cf467b721ef681bf (diff) | |
Merge angband.namesys.com:/home/green/bk/linux-2.5
into angband.namesys.com:/home/green/bk_work/reiser3-linux-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 5 | ||||
| -rw-r--r-- | include/linux/fs.h | 8 | ||||
| -rw-r--r-- | include/linux/ide.h | 7 |
3 files changed, 6 insertions, 14 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index a3e1c02d6d63..c2645da2d975 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -81,13 +81,11 @@ enum rq_flag_bits { /* * for ATA/ATAPI devices */ - __REQ_DRIVE_ACB, - __REQ_PC, /* packet command (special) */ __REQ_BLOCK_PC, /* queued down pc from block layer */ __REQ_SENSE, /* sense retrival */ - __REQ_SPECIAL, /* driver special command (currently reset) */ + __REQ_SPECIAL, /* driver suplied command */ __REQ_NR_BITS, /* stops here */ }; @@ -100,7 +98,6 @@ enum rq_flag_bits { #define REQ_STARTED (1 << __REQ_STARTED) #define REQ_DONTPREP (1 << __REQ_DONTPREP) #define REQ_QUEUED (1 << __REQ_QUEUED) -#define REQ_DRIVE_ACB (1 << __REQ_DRIVE_ACB) #define REQ_PC (1 << __REQ_PC) #define REQ_BLOCK_PC (1 << __REQ_BLOCK_PC) #define REQ_SENSE (1 << __REQ_SENSE) diff --git a/include/linux/fs.h b/include/linux/fs.h index b85ad43e6549..4a612a1c3c0a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -576,11 +576,11 @@ extern struct list_head file_lock_list; #include <linux/fcntl.h> -extern int fcntl_getlk(unsigned int, struct flock *); -extern int fcntl_setlk(unsigned int, unsigned int, struct flock *); +extern int fcntl_getlk(struct file *, struct flock *); +extern int fcntl_setlk(struct file *, unsigned int, struct flock *); -extern int fcntl_getlk64(unsigned int, struct flock64 *); -extern int fcntl_setlk64(unsigned int, unsigned int, struct flock64 *); +extern int fcntl_getlk64(struct file *, struct flock64 *); +extern int fcntl_setlk64(struct file *, unsigned int, struct flock64 *); /* fs/locks.c */ extern void locks_init_lock(struct file_lock *); diff --git a/include/linux/ide.h b/include/linux/ide.h index b5c4cdb9cedc..52a0d9b28915 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -654,11 +654,6 @@ typedef enum { extern int ide_do_drive_cmd(struct ata_device *, struct request *, ide_action_t); -/* - * Clean up after success/failure of an explicit drive cmd. - */ -extern void ide_end_drive_cmd(struct ata_device *, struct request *); - struct ata_taskfile { struct hd_drive_task_hdr taskfile; struct hd_drive_task_hdr hobfile; @@ -695,7 +690,7 @@ static inline void ide_unmap_rq(struct request *rq, char *to, bio_kunmap_irq(to, flags); } -extern ide_startstop_t task_no_data_intr(struct ata_device *, struct request *); +extern ide_startstop_t ata_special_intr(struct ata_device *, struct request *); extern int ide_raw_taskfile(struct ata_device *, struct ata_taskfile *); extern void ide_fix_driveid(struct hd_driveid *id); |