aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-08-14 16:09:22 -0700
committerSteve French <sfrench@us.ibm.com>2005-08-14 16:09:22 -0700
commit68984aedabf2552aeb21b9ed232cb8f685444e3a (patch)
tree803c93116818a1bdf9566c7b00eff7d373567f80 /fs
parent4a6d87f1db06c9670251d6c72a89319e7d1cbaee (diff)
parentb4b08e581fac8e0ba9ae348bdc13246c9798c99e (diff)
downloadlinux-68984aedabf2552aeb21b9ed232cb8f685444e3a.tar.gz
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs')
-rw-r--r--fs/reiserfs/namei.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index a20bbc1642dcda..3549067c42d941 100644
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -593,6 +593,9 @@ static int new_inode_init(struct inode *inode, struct inode *dir, int mode)
*/
inode->i_uid = current->fsuid;
inode->i_mode = mode;
+ /* Make inode invalid - just in case we are going to drop it before
+ * the initialization happens */
+ INODE_PKEY(inode)->k_objectid = 0;
if (dir->i_mode & S_ISGID) {
inode->i_gid = dir->i_gid;