sysvfs: fix NULL deref. when allocating new inode

A call to sysv_write_inode() in sysv_new_inode() to its new interface that
replaced wait flag with writeback structure.  This was broken by
a9185b41a4 ("pass writeback_control to
->write_inode").

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <stable@kernel.org>		[2.6.34.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Lubomir Rintel 2010-06-29 15:05:38 -07:00 committed by Linus Torvalds
parent 926b1e2ca3
commit 46c23d7f52
1 changed files with 5 additions and 1 deletions

View File

@ -25,6 +25,7 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/writeback.h>
#include "sysv.h" #include "sysv.h"
/* We don't trust the value of /* We don't trust the value of
@ -139,6 +140,9 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode)
struct inode *inode; struct inode *inode;
sysv_ino_t ino; sysv_ino_t ino;
unsigned count; unsigned count;
struct writeback_control wbc = {
.sync_mode = WB_SYNC_NONE
};
inode = new_inode(sb); inode = new_inode(sb);
if (!inode) if (!inode)
@ -168,7 +172,7 @@ struct inode * sysv_new_inode(const struct inode * dir, mode_t mode)
insert_inode_hash(inode); insert_inode_hash(inode);
mark_inode_dirty(inode); mark_inode_dirty(inode);
sysv_write_inode(inode, 0); /* ensure inode not allocated again */ sysv_write_inode(inode, &wbc); /* ensure inode not allocated again */
mark_inode_dirty(inode); /* cleared by sysv_write_inode() */ mark_inode_dirty(inode); /* cleared by sysv_write_inode() */
/* That's it. */ /* That's it. */
unlock_super(sb); unlock_super(sb);