3 files changed, 33 insertions, 12 deletions

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index 8dbd44f10e9d..d96e5c14a9ca 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -32,7 +32,7 @@ static inline int autofs4_can_expire(struct dentry *dentry,
 
         if (!do_now) {
                 /* Too young to die */
-                if (time_after(ino->last_used + timeout, now))
+                if (!timeout || time_after(ino->last_used + timeout, now))
                         return 0;
 
                 /* update last_used here :-
@@ -253,7 +253,7 @@ static struct dentry *autofs4_expire_direct(struct super_block *sb,
         struct dentry *root = dget(sb->s_root);
         int do_now = how & AUTOFS_EXP_IMMEDIATE;
 
-        if (!sbi->exp_timeout || !root)
+        if (!root)
                 return NULL;
 
         now = jiffies;
@@ -293,7 +293,7 @@ static struct dentry *autofs4_expire_indirect(struct super_block *sb,
         int do_now = how & AUTOFS_EXP_IMMEDIATE;
         int exp_leaves = how & AUTOFS_EXP_LEAVES;
 
-        if ( !sbi->exp_timeout || !root )
+        if (!root)
                 return NULL;
 
         now = jiffies;
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 11a6a9ae51b7..800ce876caec 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -447,7 +447,6 @@ struct inode *autofs4_get_inode(struct super_block *sb,
                 inode->i_uid = 0;
                 inode->i_gid = 0;
         }
-        inode->i_blksize = PAGE_CACHE_SIZE;
         inode->i_blocks = 0;
         inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 5100f984783f..27e17f96cada 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -137,7 +137,9 @@ static int autofs4_dir_open(struct inode *inode, struct file *file)
                 nd.flags = LOOKUP_DIRECTORY;
                 ret = (dentry->d_op->d_revalidate)(dentry, &nd);
 
-                if (!ret) {
+                if (ret <= 0) {
+                        if (ret < 0)
+                                status = ret;
                         dcache_dir_close(inode, file);
                         goto out;
                 }
@@ -400,13 +402,23 @@ static int autofs4_revalidate(struct dentry *dentry, struct nameidata *nd)
         struct autofs_sb_info *sbi = autofs4_sbi(dir->i_sb);
         int oz_mode = autofs4_oz_mode(sbi);
         int flags = nd ? nd->flags : 0;
-        int status = 0;
+        int status = 1;
 
         /* Pending dentry */
         if (autofs4_ispending(dentry)) {
-                if (!oz_mode)
-                        status = try_to_fill_dentry(dentry, flags);
-                return !status;
+                /* The daemon never causes a mount to trigger */
+                if (oz_mode)
+                        return 1;
+
+                /*
+                 * A zero status is success otherwise we have a
+                 * negative error code.
+                 */
+                status = try_to_fill_dentry(dentry, flags);
+                if (status == 0)
+                                return 1;
+
+                return status;
         }
 
         /* Negative dentry.. invalidate if "old" */
@@ -421,9 +433,19 @@ static int autofs4_revalidate(struct dentry *dentry, struct nameidata *nd)
                 DPRINTK("dentry=%p %.*s, emptydir",
                          dentry, dentry->d_name.len, dentry->d_name.name);
                 spin_unlock(&dcache_lock);
-                if (!oz_mode)
-                        status = try_to_fill_dentry(dentry, flags);
-                return !status;
+                /* The daemon never causes a mount to trigger */
+                if (oz_mode)
+                        return 1;
+
+                /*
+                 * A zero status is success otherwise we have a
+                 * negative error code.
+                 */
+                status = try_to_fill_dentry(dentry, flags);
+                if (status == 0)
+                        return 1;
+
+                return status;
         }
         spin_unlock(&dcache_lock);