git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://oss.sgi.com:8090/xfs/linux-2.6
[pandora-kernel.git]
/
fs
/
reiserfs
/
item_ops.c
diff --git
a/fs/reiserfs/item_ops.c
b/fs/reiserfs/item_ops.c
index
b9b423b
..
9475557
100644
(file)
--- a/
fs/reiserfs/item_ops.c
+++ b/
fs/reiserfs/item_ops.c
@@
-23,7
+23,7
@@
static void sd_decrement_key(struct cpu_key *key)
{
key->on_disk_key.k_objectid--;
set_cpu_key_k_type(key, TYPE_ANY);
- set_cpu_key_k_offset(key, (loff_t)
(-
1));
+ set_cpu_key_k_offset(key, (loff_t)
(~0ULL >>
1));
}
static int sd_is_left_mergeable(struct reiserfs_key *key, unsigned long bsize)