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

Pull vfs fixes from Al Viro:
 "A couple of fixes: Fix for my dumb braino in ncpfs and a long-standing
  breakage on recovery from failed rename() in jffs2"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  jffs2: reduce the breakage on recovery from halfway failed rename()
  ncpfs: fix a braino in OOM handling in ncp_fill_cache()

2 files changed, 9 insertions, 4 deletions

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index d211b8e18566..30c4c9ebb693 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -843,9 +843,14 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
 
                 pr_notice("%s(): Link succeeded, unlink failed (err %d). You now have a hard link\n",
                           __func__, ret);
-                /* Might as well let the VFS know */
-                d_instantiate(new_dentry, d_inode(old_dentry));
-                ihold(d_inode(old_dentry));
+                /*
+                 * We can't keep the target in dcache after that.
+                 * For one thing, we can't afford dentry aliases for directories.
+                 * For another, if there was a victim, we _can't_ set new inode
+                 * for that sucker and we have to trigger mount eviction - the
+                 * caller won't do it on its own since we are returning an error.
+                 */
+                d_invalidate(new_dentry);
                 new_dir_i->i_mtime = new_dir_i->i_ctime = ITIME(now);
                 return ret;
         }
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 26c2de2de13f..b7f8eaeea5d8 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -633,7 +633,7 @@ ncp_fill_cache(struct file *file, struct dir_context *ctx,
                                 d_rehash(newdent);
                 } else {
                         spin_lock(&dentry->d_lock);
-                        NCP_FINFO(inode)->flags &= ~NCPI_DIR_CACHE;
+                        NCP_FINFO(dir)->flags &= ~NCPI_DIR_CACHE;
                         spin_unlock(&dentry->d_lock);
                 }
         } else {