Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 348dbbcbedc8..a9e2cef7c95c 100644
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -302,6 +302,7 @@ EXPORT_SYMBOL_GPL(ubi_open_volume_nm);
 struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
 {
         int error, ubi_num, vol_id;
+        struct path path;
         struct kstat stat;
 
         dbg_gen("open volume %s, mode %d", pathname, mode);
@@ -309,7 +310,12 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode)
         if (!pathname || !*pathname)
                 return ERR_PTR(-EINVAL);
 
-        error = vfs_stat(pathname, &stat);
+        error = kern_path(pathname, LOOKUP_FOLLOW, &path);
+        if (error)
+                return ERR_PTR(error);
+
+        error = vfs_getattr(&path, &stat);
+        path_put(&path);
         if (error)
                 return ERR_PTR(error);