2007-12-12 05:29:03

by Andrew Morton

[permalink] [raw]
Subject: + ext-remove-unused-argument-for-ext_find_goal.patch added to -mm tree


The patch titled
ext[234]: remove unused argument for ext[234]_find_goal()
has been added to the -mm tree. Its filename is
ext-remove-unused-argument-for-ext_find_goal.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: ext[234]: remove unused argument for ext[234]_find_goal()
From: Akinobu Mita <[email protected]>

The argument chain for ext[234]_find_goal() is not used. This patch removes
it and fixes comment as well.

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

fs/ext2/inode.c | 7 ++-----
fs/ext3/inode.c | 8 +++-----
fs/ext4/inode.c | 9 +++------
3 files changed, 8 insertions(+), 16 deletions(-)

diff -puN fs/ext2/inode.c~ext-remove-unused-argument-for-ext_find_goal fs/ext2/inode.c
--- a/fs/ext2/inode.c~ext-remove-unused-argument-for-ext_find_goal
+++ a/fs/ext2/inode.c
@@ -286,15 +286,12 @@ static unsigned long ext2_find_near(stru
* ext2_find_goal - find a prefered place for allocation.
* @inode: owner
* @block: block we want
- * @chain: chain of indirect blocks
* @partial: pointer to the last triple within a chain
*
* Returns preferred place for a block (the goal).
*/

-static inline int ext2_find_goal(struct inode *inode,
- long block,
- Indirect chain[4],
+static inline int ext2_find_goal(struct inode *inode, long block,
Indirect *partial)
{
struct ext2_block_alloc_info *block_i;
@@ -639,7 +636,7 @@ reread:
if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info))
ext2_init_block_alloc_info(inode);

- goal = ext2_find_goal(inode, iblock, chain, partial);
+ goal = ext2_find_goal(inode, iblock, partial);

/* the number of blocks need to allocate for [d,t]indirect blocks */
indirect_blks = (chain + depth) - partial - 1;
diff -puN fs/ext3/inode.c~ext-remove-unused-argument-for-ext_find_goal fs/ext3/inode.c
--- a/fs/ext3/inode.c~ext-remove-unused-argument-for-ext_find_goal
+++ a/fs/ext3/inode.c
@@ -439,16 +439,14 @@ static ext3_fsblk_t ext3_find_near(struc
* ext3_find_goal - find a prefered place for allocation.
* @inode: owner
* @block: block we want
- * @chain: chain of indirect blocks
* @partial: pointer to the last triple within a chain
- * @goal: place to store the result.
*
* Normally this function find the prefered place for block allocation,
- * stores it in *@goal and returns zero.
+ * returns it.
*/

static ext3_fsblk_t ext3_find_goal(struct inode *inode, long block,
- Indirect chain[4], Indirect *partial)
+ Indirect *partial)
{
struct ext3_block_alloc_info *block_i;

@@ -884,7 +882,7 @@ int ext3_get_blocks_handle(handle_t *han
if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info))
ext3_init_block_alloc_info(inode);

- goal = ext3_find_goal(inode, iblock, chain, partial);
+ goal = ext3_find_goal(inode, iblock, partial);

/* the number of blocks need to allocate for [d,t]indirect blocks */
indirect_blks = (chain + depth) - partial - 1;
diff -puN fs/ext4/inode.c~ext-remove-unused-argument-for-ext_find_goal fs/ext4/inode.c
--- a/fs/ext4/inode.c~ext-remove-unused-argument-for-ext_find_goal
+++ a/fs/ext4/inode.c
@@ -428,16 +428,13 @@ static ext4_fsblk_t ext4_find_near(struc
* ext4_find_goal - find a prefered place for allocation.
* @inode: owner
* @block: block we want
- * @chain: chain of indirect blocks
* @partial: pointer to the last triple within a chain
- * @goal: place to store the result.
*
* Normally this function find the prefered place for block allocation,
- * stores it in *@goal and returns zero.
+ * returns it.
*/
-
static ext4_fsblk_t ext4_find_goal(struct inode *inode, ext4_lblk_t block,
- Indirect chain[4], Indirect *partial)
+ Indirect *partial)
{
struct ext4_block_alloc_info *block_i;

@@ -836,7 +833,7 @@ int ext4_get_blocks_handle(handle_t *han
if (S_ISREG(inode->i_mode) && (!ei->i_block_alloc_info))
ext4_init_block_alloc_info(inode);

- goal = ext4_find_goal(inode, iblock, chain, partial);
+ goal = ext4_find_goal(inode, iblock, partial);

/* the number of blocks need to allocate for [d,t]indirect blocks */
indirect_blks = (chain + depth) - partial - 1;
_

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

git-net.patch
git-battery.patch
fs-use-hlist_unhashed.patch
fs-use-list_for_each_entry_reverse-and-kill-sb_entry.patch
ext-fix-comment-for-nonexistent-variable.patch
ext-use-ext_get_group_desc.patch
ext-remove-unused-argument-for-ext_find_goal.patch