ocfs2: plug truncate into cached dealloc routines
authorMark Fasheh <mark.fasheh@oracle.com>
Fri, 22 Jun 2007 22:52:36 +0000 (15:52 -0700)
committerMark Fasheh <mark.fasheh@oracle.com>
Wed, 11 Jul 2007 00:31:55 +0000 (17:31 -0700)
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
fs/ocfs2/alloc.c
fs/ocfs2/alloc.h
fs/ocfs2/aops.c
fs/ocfs2/suballoc.c
fs/ocfs2/suballoc.h

Simple merge
Simple merge
diff --cc fs/ocfs2/aops.c
Simple merge
Simple merge
Simple merge