diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /fs/ext2/inode.c | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'fs/ext2/inode.c')
| -rw-r--r-- | fs/ext2/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 02b39a5deb74..23fff2f87783 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
| @@ -498,8 +498,6 @@ static int ext2_alloc_branch(struct inode *inode, | |||
| 498 | * ext2_splice_branch - splice the allocated branch onto inode. | 498 | * ext2_splice_branch - splice the allocated branch onto inode. |
| 499 | * @inode: owner | 499 | * @inode: owner |
| 500 | * @block: (logical) number of block we are adding | 500 | * @block: (logical) number of block we are adding |
| 501 | * @chain: chain of indirect blocks (with a missing link - see | ||
| 502 | * ext2_alloc_branch) | ||
| 503 | * @where: location of missing link | 501 | * @where: location of missing link |
| 504 | * @num: number of indirect blocks we are adding | 502 | * @num: number of indirect blocks we are adding |
| 505 | * @blks: number of direct blocks we are adding | 503 | * @blks: number of direct blocks we are adding |