dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[PATCH] struct path: convert sound 

Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Josef Sipek 2006-12-08 02:37:40 -08:00 committed by Linus Torvalds
parent 17b75e6949
commit 7bc563239e
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/core/info.c
View File

@ -488,7 +488,7 @@ static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,
static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma) static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
{ {
struct inode *inode = file->f_dentry->d_inode; struct inode *inode = file->f_path.dentry->d_inode;
struct snd_info_private_data *data; struct snd_info_private_data *data;
struct snd_info_entry *entry; struct snd_info_entry *entry;

2
sound/core/pcm_native.c
View File

@ -1604,7 +1604,7 @@ static struct file *snd_pcm_file_fd(int fd)
file = fget(fd); file = fget(fd);
if (!file) if (!file)
return NULL; return NULL;
inode = file->f_dentry->d_inode; inode = file->f_path.dentry->d_inode;
if (!S_ISCHR(inode->i_mode) || if (!S_ISCHR(inode->i_mode) ||
imajor(inode) != snd_major) { imajor(inode) != snd_major) {
fput(file); fput(file);

4
sound/oss/dmasound/dmasound_core.c
View File

@ -1051,7 +1051,7 @@ static int sq_release(struct inode *inode, struct file *file)
if (file->f_mode & FMODE_WRITE) { if (file->f_mode & FMODE_WRITE) {
if (write_sq.busy) if (write_sq.busy)
rc = sq_fsync(file, file->f_dentry); rc = sq_fsync(file, file->f_path.dentry);
sq_reset_output() ; /* make sure dma is stopped and all is quiet */ sq_reset_output() ; /* make sure dma is stopped and all is quiet */
write_sq_release_buffers(); write_sq_release_buffers();
@ -1217,7 +1217,7 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd,
if ((file->f_mode & FMODE_READ) && dmasound.mach.record) if ((file->f_mode & FMODE_READ) && dmasound.mach.record)
sq_reset_input() ; sq_reset_input() ;
if (file->f_mode & FMODE_WRITE) { if (file->f_mode & FMODE_WRITE) {
result = sq_fsync(file, file->f_dentry); result = sq_fsync(file, file->f_path.dentry);
sq_reset_output() ; sq_reset_output() ;
} }
/* if we are the shared resource owner then release them */ /* if we are the shared resource owner then release them */

4
sound/oss/msnd_pinnacle.c
View File

@ -1007,7 +1007,7 @@ static int dsp_write(const char __user *buf, size_t len)
static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off) static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_t *off)
{ {
int minor = iminor(file->f_dentry->d_inode); int minor = iminor(file->f_path.dentry->d_inode);
if (minor == dev.dsp_minor) if (minor == dev.dsp_minor)
return dsp_read(buf, count); return dsp_read(buf, count);
else else
@ -1016,7 +1016,7 @@ static ssize_t dev_read(struct file *file, char __user *buf, size_t count, loff_
static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off) static ssize_t dev_write(struct file *file, const char __user *buf, size_t count, loff_t *off)
{ {
int minor = iminor(file->f_dentry->d_inode); int minor = iminor(file->f_path.dentry->d_inode);
if (minor == dev.dsp_minor) if (minor == dev.dsp_minor)
return dsp_write(buf, count); return dsp_write(buf, count);
else else

8
sound/oss/soundcard.c
View File

@ -141,7 +141,7 @@ static int get_mixer_levels(void __user * arg)
static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) static ssize_t sound_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
{ {
int dev = iminor(file->f_dentry->d_inode); int dev = iminor(file->f_path.dentry->d_inode);
int ret = -EINVAL; int ret = -EINVAL;
/* /*
@ -174,7 +174,7 @@ static ssize_t sound_read(struct file *file, char __user *buf, size_t count, lof
static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) static ssize_t sound_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
{ {
int dev = iminor(file->f_dentry->d_inode); int dev = iminor(file->f_path.dentry->d_inode);
int ret = -EINVAL; int ret = -EINVAL;
lock_kernel(); lock_kernel();
@ -393,7 +393,7 @@ static int sound_ioctl(struct inode *inode, struct file *file,
static unsigned int sound_poll(struct file *file, poll_table * wait) static unsigned int sound_poll(struct file *file, poll_table * wait)
{ {
struct inode *inode = file->f_dentry->d_inode; struct inode *inode = file->f_path.dentry->d_inode;
int dev = iminor(inode); int dev = iminor(inode);
DEB(printk("sound_poll(dev=%d)\n", dev)); DEB(printk("sound_poll(dev=%d)\n", dev));
@ -418,7 +418,7 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma)
int dev_class; int dev_class;
unsigned long size; unsigned long size;
struct dma_buffparms *dmap = NULL; struct dma_buffparms *dmap = NULL;
int dev = iminor(file->f_dentry->d_inode); int dev = iminor(file->f_path.dentry->d_inode);
dev_class = dev & 0x0f; dev_class = dev & 0x0f;
dev >>= 4; dev >>= 4;

2
sound/sound_firmware.c
View File

@ -19,7 +19,7 @@ static int do_mod_firmware_load(const char *fn, char **fp)
printk(KERN_INFO "Unable to load '%s'.\n", fn); printk(KERN_INFO "Unable to load '%s'.\n", fn);
return 0; return 0;
} }
l = filp->f_dentry->d_inode->i_size; l = filp->f_path.dentry->d_inode->i_size;
if (l <= 0 || l > 131072) if (l <= 0 || l > 131072)
{ {
printk(KERN_INFO "Invalid firmware '%s'\n", fn); printk(KERN_INFO "Invalid firmware '%s'\n", fn);