[PATCH] introduce fmode_t, do annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -129,7 +129,7 @@ typedef struct {
|
||||
int (*mixer_ioctl)(u_int, u_long); /* optional */
|
||||
int (*write_sq_setup)(void); /* optional */
|
||||
int (*read_sq_setup)(void); /* optional */
|
||||
int (*sq_open)(mode_t); /* optional */
|
||||
int (*sq_open)(fmode_t); /* optional */
|
||||
int (*state_info)(char *, size_t); /* optional */
|
||||
void (*abort_read)(void); /* optional */
|
||||
int min_dsp_speed;
|
||||
@@ -235,7 +235,7 @@ struct sound_queue {
|
||||
*/
|
||||
int active;
|
||||
wait_queue_head_t action_queue, open_queue, sync_queue;
|
||||
int open_mode;
|
||||
fmode_t open_mode;
|
||||
int busy, syncing, xruns, died;
|
||||
};
|
||||
|
||||
|
@@ -143,7 +143,7 @@ static int AtaMixerIoctl(u_int cmd, u_long arg);
|
||||
static int TTMixerIoctl(u_int cmd, u_long arg);
|
||||
static int FalconMixerIoctl(u_int cmd, u_long arg);
|
||||
static int AtaWriteSqSetup(void);
|
||||
static int AtaSqOpen(mode_t mode);
|
||||
static int AtaSqOpen(fmode_t mode);
|
||||
static int TTStateInfo(char *buffer, size_t space);
|
||||
static int FalconStateInfo(char *buffer, size_t space);
|
||||
|
||||
@@ -1461,7 +1461,7 @@ static int AtaWriteSqSetup(void)
|
||||
return 0 ;
|
||||
}
|
||||
|
||||
static int AtaSqOpen(mode_t mode)
|
||||
static int AtaSqOpen(fmode_t mode)
|
||||
{
|
||||
write_sq_ignore_int = 1;
|
||||
return 0 ;
|
||||
|
@@ -212,7 +212,7 @@ static int irq_installed;
|
||||
#endif /* MODULE */
|
||||
|
||||
/* control over who can modify resources shared between play/record */
|
||||
static mode_t shared_resource_owner;
|
||||
static fmode_t shared_resource_owner;
|
||||
static int shared_resources_initialised;
|
||||
|
||||
/*
|
||||
@@ -668,7 +668,7 @@ static inline void sq_init_waitqueue(struct sound_queue *sq)
|
||||
|
||||
#if 0 /* blocking open() */
|
||||
static inline void sq_wake_up(struct sound_queue *sq, struct file *file,
|
||||
mode_t mode)
|
||||
fmode_t mode)
|
||||
{
|
||||
if (file->f_mode & mode) {
|
||||
sq->busy = 0; /* CHECK: IS THIS OK??? */
|
||||
@@ -677,7 +677,7 @@ static inline void sq_wake_up(struct sound_queue *sq, struct file *file,
|
||||
}
|
||||
#endif
|
||||
|
||||
static int sq_open2(struct sound_queue *sq, struct file *file, mode_t mode,
|
||||
static int sq_open2(struct sound_queue *sq, struct file *file, fmode_t mode,
|
||||
int numbufs, int bufsize)
|
||||
{
|
||||
int rc = 0;
|
||||
@@ -891,10 +891,10 @@ static int sq_release(struct inode *inode, struct file *file)
|
||||
is the owner - if we have problems.
|
||||
*/
|
||||
|
||||
static int shared_resources_are_mine(mode_t md)
|
||||
static int shared_resources_are_mine(fmode_t md)
|
||||
{
|
||||
if (shared_resource_owner)
|
||||
return (shared_resource_owner & md ) ;
|
||||
return (shared_resource_owner & md) != 0;
|
||||
else {
|
||||
shared_resource_owner = md ;
|
||||
return 1 ;
|
||||
|
Viittaa uudesa ongelmassa
Block a user