diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-23 17:07:38 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:31 -0500 |
commit | 496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch) | |
tree | 8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /sound/core | |
parent | 57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff) |
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/info.c | 2 | ||||
-rw-r--r-- | sound/core/pcm_native.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/info.c b/sound/core/info.c index 6b368d25073b..5bb97e7d325a 100644 --- a/sound/core/info.c +++ b/sound/core/info.c | |||
@@ -496,7 +496,7 @@ static long snd_info_entry_ioctl(struct file *file, unsigned int cmd, | |||
496 | 496 | ||
497 | static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma) | 497 | static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma) |
498 | { | 498 | { |
499 | struct inode *inode = file->f_path.dentry->d_inode; | 499 | struct inode *inode = file_inode(file); |
500 | struct snd_info_private_data *data; | 500 | struct snd_info_private_data *data; |
501 | struct snd_info_entry *entry; | 501 | struct snd_info_entry *entry; |
502 | 502 | ||
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 09b4286c65f9..71ae86ca64ac 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
@@ -1586,7 +1586,7 @@ static struct file *snd_pcm_file_fd(int fd, int *fput_needed) | |||
1586 | file = fget_light(fd, fput_needed); | 1586 | file = fget_light(fd, fput_needed); |
1587 | if (!file) | 1587 | if (!file) |
1588 | return NULL; | 1588 | return NULL; |
1589 | inode = file->f_path.dentry->d_inode; | 1589 | inode = file_inode(file); |
1590 | if (!S_ISCHR(inode->i_mode) || | 1590 | if (!S_ISCHR(inode->i_mode) || |
1591 | imajor(inode) != snd_major) { | 1591 | imajor(inode) != snd_major) { |
1592 | fput_light(file, *fput_needed); | 1592 | fput_light(file, *fput_needed); |