fs/unionfs/commonfops.c | 35 +++++++++--------------------------
fs/unionfs/fanout.h | 14 ++++++++++++++
2 files changed, 23 insertions(+), 26 deletions(-)
New commits:
commit 463ae1c8e7f38d97c3a756245e9cd22af8fcf749
Merge: f354bf3096af0d1bb4e0bb7fca42a607338ebf33
2f8cbae99444b83f13535487c0a22ee68df405ae
Author: Erez_Zadok <[EMAIL PROTECTED]>
Date: Fri May 25 16:36:43 2007 -0400
Merge branch 'master' of story:/home/git/unionfs-odf
commit f354bf3096af0d1bb4e0bb7fca42a607338ebf33
Author: Erez_Zadok <[EMAIL PROTECTED]>
Date: Fri May 25 16:36:08 2007 -0400
unionfs: merge find_new_branch_index and branch_id_to_idx into one function
Useful code cleanup and consolidation between the ODF code and non-ODF code.
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
Conflicts:
fs/unionfs/commonfops.c
fs/unionfs/fanout.h
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
