mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 14:42:24 +00:00
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: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
5b45d96bf9
commit
2f1169e2dc
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user