projects
/
unionfs-2.6.19.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4f477d9
)
optimize branch overlapping test a bit
author
Erez_Zadok
<ezk@cs.sunysb.edu>
Fri, 4 May 2007 18:44:02 +0000
(14:44 -0400)
committer
Erez_Zadok
<ezk@cs.sunysb.edu>
Tue, 3 Jul 2007 22:55:10 +0000
(18:55 -0400)
fs/unionfs/main.c
patch
|
blob
|
history
diff --git
a/fs/unionfs/main.c
b/fs/unionfs/main.c
index 772319025c469a11789846dd8a40576203779c3e..ffcd04074d57682280d311d56d0cd6acecd0183b 100644
(file)
--- a/
fs/unionfs/main.c
+++ b/
fs/unionfs/main.c
@@
-366,10
+366,9
@@
static int parse_dirs_option(struct super_block *sb, struct unionfs_dentry_info
* branch-overlapping test.
*/
for (i = 0; i < branches; i++) {
+ dent1 = hidden_root_info->lower_paths[i].dentry;
for (j = i + 1; j < branches; j++) {
- dent1 = hidden_root_info->lower_paths[i].dentry;
dent2 = hidden_root_info->lower_paths[j].dentry;
-
if (is_branch_overlap(dent1, dent2)) {
printk(KERN_WARNING "unionfs: branches %d and "
"%d overlap\n", i, j);