diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /fs/ext4/mballoc.c | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'fs/ext4/mballoc.c')
| -rw-r--r-- | fs/ext4/mballoc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 506713a2ebd8..54df209d2eed 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | * | 69 | * |
| 70 | * pa_lstart -> the logical start block for this prealloc space | 70 | * pa_lstart -> the logical start block for this prealloc space |
| 71 | * pa_pstart -> the physical start block for this prealloc space | 71 | * pa_pstart -> the physical start block for this prealloc space |
| 72 | * pa_len -> lenght for this prealloc space | 72 | * pa_len -> length for this prealloc space |
| 73 | * pa_free -> free space available in this prealloc space | 73 | * pa_free -> free space available in this prealloc space |
| 74 | * | 74 | * |
| 75 | * The inode preallocation space is used looking at the _logical_ start | 75 | * The inode preallocation space is used looking at the _logical_ start |