git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
hfs
/
brec.c
diff --git
a/fs/hfs/brec.c
b/fs/hfs/brec.c
index
5e54671
..
5c87cf4
100644
(file)
--- a/
fs/hfs/brec.c
+++ b/
fs/hfs/brec.c
@@
-10,10
+10,14
@@
#include "btree.h"
#include "btree.h"
+static struct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd);
+static int hfs_brec_update_parent(struct hfs_find_data *fd);
+static int hfs_btree_inc_height(struct hfs_btree *tree);
+
/* Get the length and offset of the given record in the given node */
u16 hfs_brec_lenoff(struct hfs_bnode *node, u16 rec, u16 *off)
{
/* Get the length and offset of the given record in the given node */
u16 hfs_brec_lenoff(struct hfs_bnode *node, u16 rec, u16 *off)
{
-
u
16 retval[2];
+
__be
16 retval[2];
u16 dataoff;
dataoff = node->tree->node_size - (rec + 2) * 2;
u16 dataoff;
dataoff = node->tree->node_size - (rec + 2) * 2;
@@
-55,7
+59,7
@@
int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len)
int size, key_len, rec;
int data_off, end_off;
int idx_rec_off, data_rec_off, end_rec_off;
int size, key_len, rec;
int data_off, end_off;
int idx_rec_off, data_rec_off, end_rec_off;
-
u
32 cnid;
+
__be
32 cnid;
tree = fd->tree;
if (!fd->bnode) {
tree = fd->tree;
if (!fd->bnode) {
@@
-211,7
+215,7
@@
skip:
return 0;
}
return 0;
}
-struct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd)
+st
atic st
ruct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd)
{
struct hfs_btree *tree;
struct hfs_bnode *node, *new_node;
{
struct hfs_btree *tree;
struct hfs_bnode *node, *new_node;
@@
-320,7
+324,7
@@
struct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd)
return new_node;
}
return new_node;
}
-int hfs_brec_update_parent(struct hfs_find_data *fd)
+
static
int hfs_brec_update_parent(struct hfs_find_data *fd)
{
struct hfs_btree *tree;
struct hfs_bnode *node, *new_node, *parent;
{
struct hfs_btree *tree;
struct hfs_bnode *node, *new_node, *parent;
@@
-358,7
+362,7
@@
again:
end_off = hfs_bnode_read_u16(parent, end_rec_off);
if (end_rec_off - end_off < diff) {
end_off = hfs_bnode_read_u16(parent, end_rec_off);
if (end_rec_off - end_off < diff) {
- printk(
"
splitting index node...\n");
+ printk(
KERN_DEBUG "hfs:
splitting index node...\n");
fd->bnode = parent;
new_node = hfs_bnode_split(fd);
if (IS_ERR(new_node))
fd->bnode = parent;
new_node = hfs_bnode_split(fd);
if (IS_ERR(new_node))
@@
-391,7
+395,7
@@
skip:
node = parent;
if (new_node) {
node = parent;
if (new_node) {
-
u
32 cnid;
+
__be
32 cnid;
fd->bnode = hfs_bnode_find(tree, new_node->parent);
/* create index key and entry */
fd->bnode = hfs_bnode_find(tree, new_node->parent);
/* create index key and entry */
@@
-418,12
+422,12
@@
out:
return 0;
}
return 0;
}
-int hfs_btree_inc_height(struct hfs_btree *tree)
+
static
int hfs_btree_inc_height(struct hfs_btree *tree)
{
struct hfs_bnode *node, *new_node;
struct hfs_bnode_desc node_desc;
int key_size, rec;
{
struct hfs_bnode *node, *new_node;
struct hfs_bnode_desc node_desc;
int key_size, rec;
-
u
32 cnid;
+
__be
32 cnid;
node = NULL;
if (tree->root) {
node = NULL;
if (tree->root) {