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

Pull vfs updates from Al Viro:
 "All kinds of stuff this time around; some more notable parts:

   - RCU'd vfsmounts handling
   - new primitives for coredump handling
   - files_lock is gone
   - Bruce's delegations handling series
   - exportfs fixes

  plus misc stuff all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (101 commits)
  ecryptfs: ->f_op is never NULL
  locks: break delegations on any attribute modification
  locks: break delegations on link
  locks: break delegations on rename
  locks: helper functions for delegation breaking
  locks: break delegations on unlink
  namei: minor vfs_unlink cleanup
  locks: implement delegations
  locks: introduce new FL_DELEG lock flag
  vfs: take i_mutex on renamed file
  vfs: rename I_MUTEX_QUOTA now that it's not used for quotas
  vfs: don't use PARENT/CHILD lock classes for non-directories
  vfs: pull ext4's double-i_mutex-locking into common code
  exportfs: fix quadratic behavior in filehandle lookup
  exportfs: better variable name
  exportfs: move most of reconnect_path to helper function
  exportfs: eliminate unused "noprogress" counter
  exportfs: stop retrying once we race with rename/remove
  exportfs: clear DISCONNECTED on all parents sooner
  exportfs: more detailed comment for path_reconnect
  ...

2 files changed, 9 insertions, 30 deletions

diff --git a/sound/core/sound.c b/sound/core/sound.c
index f002bd911dae..437c25ea6403 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -153,7 +153,7 @@ static int snd_open(struct inode *inode, struct file *file)
 {
         unsigned int minor = iminor(inode);
         struct snd_minor *mptr = NULL;
-        const struct file_operations *old_fops;
+        const struct file_operations *new_fops;
         int err = 0;
 
         if (minor >= ARRAY_SIZE(snd_minors))
@@ -167,24 +167,14 @@ static int snd_open(struct inode *inode, struct file *file)
                         return -ENODEV;
                 }
         }
-        old_fops = file->f_op;
-        file->f_op = fops_get(mptr->f_ops);
-        if (file->f_op == NULL) {
-                file->f_op = old_fops;
-                err = -ENODEV;
-        }
+        new_fops = fops_get(mptr->f_ops);
         mutex_unlock(&sound_mutex);
-        if (err < 0)
-                return err;
+        if (!new_fops)
+                return -ENODEV;
+        replace_fops(file, new_fops);
 
-        if (file->f_op->open) {
+        if (file->f_op->open)
                 err = file->f_op->open(inode, file);
-                if (err) {
-                        fops_put(file->f_op);
-                        file->f_op = fops_get(old_fops);
-                }
-        }
-        fops_put(old_fops);
         return err;
 }
 
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 45759f4cca75..11e953a1fa45 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -626,31 +626,20 @@ static int soundcore_open(struct inode *inode, struct file *file)
                 if (s)
                         new_fops = fops_get(s->unit_fops);
         }
+        spin_unlock(&sound_loader_lock);
         if (new_fops) {
                 /*
                  * We rely upon the fact that we can't be unloaded while the
-                 * subdriver is there, so if ->open() is successful we can
-                 * safely drop the reference counter and if it is not we can
-                 * revert to old ->f_op. Ugly, indeed, but that's the cost of
-                 * switching ->f_op in the first place.
+                 * subdriver is there.
                  */
                 int err = 0;
-                const struct file_operations *old_fops = file->f_op;
-                file->f_op = new_fops;
-                spin_unlock(&sound_loader_lock);
+                replace_fops(file, new_fops);
 
                 if (file->f_op->open)
                         err = file->f_op->open(inode,file);
 
-                if (err) {
-                        fops_put(file->f_op);
-                        file->f_op = fops_get(old_fops);
-                }
-
-                fops_put(old_fops);
                 return err;
         }
-        spin_unlock(&sound_loader_lock);
         return -ENODEV;
 }