2008-04-28 22:00:23

by Andrew Morton

[permalink] [raw]
Subject: - ext2-use-ext2_fsblk_t-type.patch removed from -mm tree

The patch titled
ext2: use ext2_fsblk_t type
has been removed from the -mm tree. Its filename was

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

Subject: ext2: use ext2_fsblk_t type
From: Akinobu Mita <[email protected]>

Use ext2_fsblk_t type for filesystem-wide blocks number

Signed-off-by: Akinobu Mita <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/ext2/inode.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff -puN fs/ext2/inode.c~ext2-use-ext2_fsblk_t-type fs/ext2/inode.c
--- a/fs/ext2/inode.c~ext2-use-ext2_fsblk_t-type
+++ a/fs/ext2/inode.c
@@ -254,13 +254,13 @@ no_block:
* Caller must make sure that @ind is valid and will stay that way.

-static unsigned long ext2_find_near(struct inode *inode, Indirect *ind)
+static ext2_fsblk_t ext2_find_near(struct inode *inode, Indirect *ind)
struct ext2_inode_info *ei = EXT2_I(inode);
__le32 *start = ind->bh ? (__le32 *) ind->bh->b_data : ei->i_data;
__le32 *p;
- unsigned long bg_start;
- unsigned long colour;
+ ext2_fsblk_t bg_start;
+ ext2_fsblk_t colour;

/* Try to find previous block */
for (p = ind->p - 1; p >= start; p--)
@@ -290,8 +290,8 @@ static unsigned long ext2_find_near(stru
* Returns preferred place for a block (the goal).

-static inline int ext2_find_goal(struct inode *inode, long block,
- Indirect *partial)
+static inline ext2_fsblk_t ext2_find_goal(struct inode *inode, long block,
+ Indirect *partial)
struct ext2_block_alloc_info *block_i;


Patches currently in -mm which might be from [email protected] are