# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.590 -> 1.591
# fs/reiserfs/inode.c 1.35 -> 1.36
# include/linux/reiserfs_fs.h 1.22 -> 1.23
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/09
[email protected] 1.587.1.32
# [PATCH] PATCH: forte sound
#
# --------------------------------------------
# 02/09/09
[email protected] 1.591
# reiserfs: Take into account file information even when not doing preallocation. Fixes a bug with displacing_large_files option
# --------------------------------------------
#
diff -Nru a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
--- a/fs/reiserfs/inode.c Tue Sep 10 13:49:46 2002
+++ b/fs/reiserfs/inode.c Tue Sep 10 13:49:46 2002
@@ -511,7 +511,7 @@
return reiserfs_new_unf_blocknrs2(th, inode, allocated_block_nr, path, block);
}
#endif
- return reiserfs_new_unf_blocknrs (th, allocated_block_nr, path, block);
+ return reiserfs_new_unf_blocknrs (th, inode, allocated_block_nr, path, block);
}
static int reiserfs_get_block (struct inode * inode, long block,
diff -Nru a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
--- a/include/linux/reiserfs_fs.h Tue Sep 10 13:49:46 2002
+++ b/include/linux/reiserfs_fs.h Tue Sep 10 13:49:46 2002
@@ -1970,13 +1970,14 @@
}
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
