diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /fs/ocfs2/alloc.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'fs/ocfs2/alloc.c')
| -rw-r--r-- | fs/ocfs2/alloc.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 10bfb466e068..29ff57ec5d1f 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
| @@ -990,15 +990,6 @@ out: | |||
| 990 | } | 990 | } |
| 991 | 991 | ||
| 992 | /* | 992 | /* |
| 993 | * This is only valid for leaf nodes, which are the only ones that can | ||
| 994 | * have empty extents anyway. | ||
| 995 | */ | ||
| 996 | static inline int ocfs2_is_empty_extent(struct ocfs2_extent_rec *rec) | ||
| 997 | { | ||
| 998 | return !rec->e_leaf_clusters; | ||
| 999 | } | ||
| 1000 | |||
| 1001 | /* | ||
| 1002 | * This function will discard the rightmost extent record. | 993 | * This function will discard the rightmost extent record. |
| 1003 | */ | 994 | */ |
| 1004 | static void ocfs2_shift_records_right(struct ocfs2_extent_list *el) | 995 | static void ocfs2_shift_records_right(struct ocfs2_extent_list *el) |