Merge tag 'v3.17' into next

Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.

1 files changed, 6 insertions, 7 deletions

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 340a92d08e84..2c2d6d1d8eee 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -529,12 +529,12 @@ static noinline int device_list_add(const char *path,
                  */
 
                 /*
-                 * As of now don't allow update to btrfs_fs_device through
-                 * the btrfs dev scan cli, after FS has been mounted.
+                 * For now, we do allow update to btrfs_fs_device through the
+                 * btrfs dev scan cli after FS has been mounted.  We're still
+                 * tracking a problem where systems fail mount by subvolume id
+                 * when we reject replacement on a mounted FS.
                  */
-                if (fs_devices->opened) {
-                        return -EBUSY;
-                } else {
+                if (!fs_devices->opened && found_transid < device->generation) {
                         /*
                          * That is if the FS is _not_ mounted and if you
                          * are here, that means there is more than one
@@ -542,8 +542,7 @@ static noinline int device_list_add(const char *path,
                          * with larger generation number or the last-in if
                          * generation are equal.
                          */
-                        if (found_transid < device->generation)
-                                return -EEXIST;
+                        return -EEXIST;
                 }
 
                 name = rcu_string_strdup(path, GFP_NOFS);