diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-11 10:13:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-11 10:13:49 -0800 |
| commit | 63cf207e931894b93fe5471131e41fda567611e2 (patch) | |
| tree | b27920e481e6cbb6d3c310ca385368d3dccdec1e /fs/ncpfs/dir.c | |
| parent | f2c1242194c7af9b26f53359ab2b23df36d3a643 (diff) | |
| parent | f93812846f31381d35c04c6c577d724254355e7f (diff) | |
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()
Diffstat (limited to 'fs/ncpfs/dir.c')
| -rw-r--r-- | fs/ncpfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |