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
reverts to 2.6.12
[linux-2.6.git]
/
fs
/
ext3
/
dir.c
diff --git
a/fs/ext3/dir.c
b/fs/ext3/dir.c
index
f11d6ca
..
f37528e
100644
(file)
--- a/
fs/ext3/dir.c
+++ b/
fs/ext3/dir.c
@@
-151,9
+151,6
@@
static int ext3_readdir(struct file * filp,
ext3_error (sb, "ext3_readdir",
"directory #%lu contains a hole at offset %lu",
inode->i_ino, (unsigned long)filp->f_pos);
ext3_error (sb, "ext3_readdir",
"directory #%lu contains a hole at offset %lu",
inode->i_ino, (unsigned long)filp->f_pos);
- /* corrupt size? Maybe no more blocks to read */
- if (filp->f_pos > inode->i_blocks << 9)
- break;
filp->f_pos += sb->s_blocksize - offset;
continue;
}
filp->f_pos += sb->s_blocksize - offset;
continue;
}
@@
-287,7
+284,7
@@
static void free_rb_tree_fname(struct rb_root *root)
* beginning of the loop and try to free the parent
* node.
*/
* beginning of the loop and try to free the parent
* node.
*/
- parent =
rb_parent(n)
;
+ parent =
n->rb_parent
;
fname = rb_entry(n, struct fname, rb_hash);
while (fname) {
struct fname * old = fname;
fname = rb_entry(n, struct fname, rb_hash);
while (fname) {
struct fname * old = fname;