Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull second set of VFS changes from Al Viro:
 "Assorted f_pos race fixes, making do_splice_direct() safe to call with
  i_mutex on parent, O_TMPFILE support, Jeff's locks.c series,
  ->d_hash/->d_compare calling conventions changes from Linus, misc
  stuff all over the place."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
  Document ->tmpfile()
  ext4: ->tmpfile() support
  vfs: export lseek_execute() to modules
  lseek_execute() doesn't need an inode passed to it
  block_dev: switch to fixed_size_llseek()
  cpqphp_sysfs: switch to fixed_size_llseek()
  tile-srom: switch to fixed_size_llseek()
  proc_powerpc: switch to fixed_size_llseek()
  ubi/cdev: switch to fixed_size_llseek()
  pci/proc: switch to fixed_size_llseek()
  isapnp: switch to fixed_size_llseek()
  lpfc: switch to fixed_size_llseek()
  locks: give the blocked_hash its own spinlock
  locks: add a new "lm_owner_key" lock operation
  locks: turn the blocked_list into a hashtable
  locks: convert fl_link to a hlist_node
  locks: avoid taking global lock if possible when waking up blocked waiters
  locks: protect most of the file_lock handling with i_lock
  locks: encapsulate the fl_link list handling
  locks: make "added" in __posix_lock_file a bool
  ...

1 files changed, 15 insertions, 25 deletions

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index f92818155958..a68d4c6d702c 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1589,29 +1589,16 @@ static int snd_pcm_drop(struct snd_pcm_substream *substream)
 }
 
 
-/* WARNING: Don't forget to fput back the file */
-static struct file *snd_pcm_file_fd(int fd, int *fput_needed)
+static bool is_pcm_file(struct file *file)
 {
-        struct file *file;
-        struct inode *inode;
+        struct inode *inode = file_inode(file);
         unsigned int minor;
 
-        file = fget_light(fd, fput_needed);
-        if (!file)
-                return NULL;
-        inode = file_inode(file);
-        if (!S_ISCHR(inode->i_mode) ||
-            imajor(inode) != snd_major) {
-                fput_light(file, *fput_needed);
-                return NULL;
-        }
+        if (!S_ISCHR(inode->i_mode) || imajor(inode) != snd_major)
+                return false;
         minor = iminor(inode);
-        if (!snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_PLAYBACK) &&
-            !snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_CAPTURE)) {
-                fput_light(file, *fput_needed);
-                return NULL;
-        }
-        return file;
+        return snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_PLAYBACK) ||
+                snd_lookup_minor_data(minor, SNDRV_DEVICE_TYPE_PCM_CAPTURE);
 }
 
 /*
@@ -1620,16 +1607,18 @@ static struct file *snd_pcm_file_fd(int fd, int *fput_needed)
 static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
 {
         int res = 0;
-        struct file *file;
         struct snd_pcm_file *pcm_file;
         struct snd_pcm_substream *substream1;
         struct snd_pcm_group *group;
-        int fput_needed;
+        struct fd f = fdget(fd);
 
-        file = snd_pcm_file_fd(fd, &fput_needed);
-        if (!file)
+        if (!f.file)
                 return -EBADFD;
-        pcm_file = file->private_data;
+        if (!is_pcm_file(f.file)) {
+                res = -EBADFD;
+                goto _badf;
+        }
+        pcm_file = f.file->private_data;
         substream1 = pcm_file->substream;
         group = kmalloc(sizeof(*group), GFP_KERNEL);
         if (!group) {
@@ -1663,8 +1652,9 @@ static int snd_pcm_link(struct snd_pcm_substream *substream, int fd)
         up_write(&snd_pcm_link_rwsem);
  _nolock:
         snd_card_unref(substream1->pcm->card);
-        fput_light(file, fput_needed);
         kfree(group);
+ _badf:
+        fdput(f);
         return res;
 }