diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /fs/ocfs2/alloc.c | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'fs/ocfs2/alloc.c')
| -rw-r--r-- | fs/ocfs2/alloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index fb4e672579b8..d17bdc718f74 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
| @@ -1765,9 +1765,9 @@ set_and_inc: | |||
| 1765 | * | 1765 | * |
| 1766 | * The array index of the subtree root is passed back. | 1766 | * The array index of the subtree root is passed back. |
| 1767 | */ | 1767 | */ |
| 1768 | static int ocfs2_find_subtree_root(struct ocfs2_extent_tree *et, | 1768 | int ocfs2_find_subtree_root(struct ocfs2_extent_tree *et, |
| 1769 | struct ocfs2_path *left, | 1769 | struct ocfs2_path *left, |
| 1770 | struct ocfs2_path *right) | 1770 | struct ocfs2_path *right) |
| 1771 | { | 1771 | { |
| 1772 | int i = 0; | 1772 | int i = 0; |
| 1773 | 1773 | ||
| @@ -2872,8 +2872,8 @@ out: | |||
| 2872 | * This looks similar, but is subtly different to | 2872 | * This looks similar, but is subtly different to |
| 2873 | * ocfs2_find_cpos_for_left_leaf(). | 2873 | * ocfs2_find_cpos_for_left_leaf(). |
| 2874 | */ | 2874 | */ |
| 2875 | static int ocfs2_find_cpos_for_right_leaf(struct super_block *sb, | 2875 | int ocfs2_find_cpos_for_right_leaf(struct super_block *sb, |
| 2876 | struct ocfs2_path *path, u32 *cpos) | 2876 | struct ocfs2_path *path, u32 *cpos) |
| 2877 | { | 2877 | { |
| 2878 | int i, j, ret = 0; | 2878 | int i, j, ret = 0; |
| 2879 | u64 blkno; | 2879 | u64 blkno; |
