Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f1169e2 authored by Al Viro's avatar Al Viro
Browse files

fix breakage in reiserfs_new_inode() 



now that we use ih.key earlier, we need to do all its setup early enough

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5b45d96b

fs/reiserfs/inode.c

+6 −7
Original line number Diff line number Diff line
@@ -1782,6 +1782,12 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, 
		goto out_bad_inode;

	}

	args.objectid = inode->i_ino = le32_to_cpu(ih.ih_key.k_objectid);

	if (old_format_only(sb))

		make_le_item_head(&ih, NULL, KEY_FORMAT_3_5, SD_OFFSET,

				  TYPE_STAT_DATA, SD_V1_SIZE, MAX_US_INT);

	else

		make_le_item_head(&ih, NULL, KEY_FORMAT_3_6, SD_OFFSET,

				  TYPE_STAT_DATA, SD_SIZE, MAX_US_INT);

	memcpy(INODE_PKEY(inode), &(ih.ih_key), KEY_SIZE);

	args.dirid = le32_to_cpu(ih.ih_key.k_dir_id);

	if (insert_inode_locked4(inode, args.objectid,
@@ -1834,13 +1840,6 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, 
	reiserfs_init_acl_default(inode);

	reiserfs_init_xattr_rwsem(inode);



	if (old_format_only(sb))

		make_le_item_head(&ih, NULL, KEY_FORMAT_3_5, SD_OFFSET,

				  TYPE_STAT_DATA, SD_V1_SIZE, MAX_US_INT);

	else

		make_le_item_head(&ih, NULL, KEY_FORMAT_3_6, SD_OFFSET,

				  TYPE_STAT_DATA, SD_SIZE, MAX_US_INT);



	/* key to search for correct place for new stat data */

	_make_cpu_key(&key, KEY_FORMAT_3_6, le32_to_cpu(ih.ih_key.k_dir_id),

		      le32_to_cpu(ih.ih_key.k_objectid), SD_OFFSET,