diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2014-11-05 12:19:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2014-11-05 12:19:58 -0800 |
| commit | 20f3963d8f48ae8309fbc777ef6787fd0a3f53c2 (patch) | |
| tree | 299f098bf4a5e2392acaa3872c8bf5cbae0dc401 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
| parent | ovl: don't poison cursor (diff) | |
| download | linux-20f3963d8f48ae8309fbc777ef6787fd0a3f53c2.tar.gz linux-20f3963d8f48ae8309fbc777ef6787fd0a3f53c2.tar.bz2 linux-20f3963d8f48ae8309fbc777ef6787fd0a3f53c2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fix from Al Viro:
"Another overlayfs fix"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ovl: don't poison cursor
| -rw-r--r-- | fs/overlayfs/readdir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c index 4e9d7c1fea52..2a7ef4f8e2a6 100644 --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c @@ -168,7 +168,7 @@ static void ovl_cache_put(struct ovl_dir_file *od, struct dentry *dentry) { struct ovl_dir_cache *cache = od->cache; - list_del(&od->cursor.l_node); + list_del_init(&od->cursor.l_node); WARN_ON(cache->refcount <= 0); cache->refcount--; if (!cache->refcount) { |