summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-12-14 00:04:11 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-12-14 00:04:11 -0800
commit36db78e3b294f130fd3a9d3835c4600746ea6ac1 (patch)
tree32819d430d5bebcc8af5bf17fee2ce896742b227 /include/linux
parent49b0c2a354cc29c353ab11929f75b2f83130b34b (diff)
parent2b3cd4fd7c248937ea9747bca85d48df3582629e (diff)
Merge bk://thebsh.namesys.com/bk/reiser3-linux-2.5-fixes
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/reiserfs_fs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index 9841fd436cfe..bd3f28d266c2 100644
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -2073,13 +2073,14 @@ extern inline int reiserfs_new_form_blocknrs (struct tree_balance * tb,
}
extern inline int reiserfs_new_unf_blocknrs (struct reiserfs_transaction_handle *th,
+ struct inode *inode,
b_blocknr_t *new_blocknrs,
struct path * path, long block)
{
reiserfs_blocknr_hint_t hint = {
.th = th,
.path = path,
- .inode = NULL,
+ .inode = inode,
.block = block,
.formatted_node = 0,
.preallocate = 0