Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

1 files changed, 8 insertions, 11 deletions

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index ec0c2a050043..4060ffde8722 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -12,8 +12,7 @@
 #include <linux/xattr.h>
 #include "overlayfs.h"
 
-static int ovl_copy_up_last(struct dentry *dentry, struct iattr *attr,
-                            bool no_data)
+static int ovl_copy_up_truncate(struct dentry *dentry)
 {
         int err;
         struct dentry *parent;
@@ -30,10 +29,8 @@ static int ovl_copy_up_last(struct dentry *dentry, struct iattr *attr,
         if (err)
                 goto out_dput_parent;
 
-        if (no_data)
-                stat.size = 0;
-
-        err = ovl_copy_up_one(parent, dentry, &lowerpath, &stat, attr);
+        stat.size = 0;
+        err = ovl_copy_up_one(parent, dentry, &lowerpath, &stat);
 
 out_dput_parent:
         dput(parent);
@@ -49,13 +46,13 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr)
         if (err)
                 goto out;
 
-        upperdentry = ovl_dentry_upper(dentry);
-        if (upperdentry) {
+        err = ovl_copy_up(dentry);
+        if (!err) {
+                upperdentry = ovl_dentry_upper(dentry);
+
                 mutex_lock(&upperdentry->d_inode->i_mutex);
                 err = notify_change(upperdentry, attr, NULL);
                 mutex_unlock(&upperdentry->d_inode->i_mutex);
-        } else {
-                err = ovl_copy_up_last(dentry, attr, false);
         }
         ovl_drop_write(dentry);
 out:
@@ -353,7 +350,7 @@ struct inode *ovl_d_select_inode(struct dentry *dentry, unsigned file_flags)
                         return ERR_PTR(err);
 
                 if (file_flags & O_TRUNC)
-                        err = ovl_copy_up_last(dentry, NULL, true);
+                        err = ovl_copy_up_truncate(dentry);
                 else
                         err = ovl_copy_up(dentry);
                 ovl_drop_write(dentry);