diff options
-rw-r--r-- | Documentation/filesystems/logfs.txt | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2443/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/gpio-core.h | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-omap.c | 2 | ||||
-rw-r--r-- | fs/logfs/dir.c | 2 | ||||
-rw-r--r-- | fs/logfs/logfs.h | 2 | ||||
-rw-r--r-- | fs/logfs/logfs_abi.h | 10 |
7 files changed, 14 insertions, 14 deletions
diff --git a/Documentation/filesystems/logfs.txt b/Documentation/filesystems/logfs.txt index e64c94ba401a..bca42c22a143 100644 --- a/Documentation/filesystems/logfs.txt +++ b/Documentation/filesystems/logfs.txt | |||
@@ -59,7 +59,7 @@ Levels | |||
59 | ------ | 59 | ------ |
60 | 60 | ||
61 | Garbage collection (GC) may fail if all data is written | 61 | Garbage collection (GC) may fail if all data is written |
62 | indiscriminately. One requirement of GC is that data is seperated | 62 | indiscriminately. One requirement of GC is that data is separated |
63 | roughly according to the distance between the tree root and the data. | 63 | roughly according to the distance between the tree root and the data. |
64 | Effectively that means all file data is on level 0, indirect blocks | 64 | Effectively that means all file data is on level 0, indirect blocks |
65 | are on levels 1, 2, 3 4 or 5 for 1x, 2x, 3x, 4x or 5x indirect blocks, | 65 | are on levels 1, 2, 3 4 or 5 for 1x, 2x, 3x, 4x or 5x indirect blocks, |
@@ -67,7 +67,7 @@ respectively. Inode file data is on level 6 for the inodes and 7-11 | |||
67 | for indirect blocks. | 67 | for indirect blocks. |
68 | 68 | ||
69 | Each segment contains objects of a single level only. As a result, | 69 | Each segment contains objects of a single level only. As a result, |
70 | each level requires its own seperate segment to be open for writing. | 70 | each level requires its own separate segment to be open for writing. |
71 | 71 | ||
72 | Inode File | 72 | Inode File |
73 | ---------- | 73 | ---------- |
@@ -106,9 +106,9 @@ Vim | |||
106 | --- | 106 | --- |
107 | 107 | ||
108 | By cleverly predicting the life time of data, it is possible to | 108 | By cleverly predicting the life time of data, it is possible to |
109 | seperate long-living data from short-living data and thereby reduce | 109 | separate long-living data from short-living data and thereby reduce |
110 | the GC overhead later. Each type of distinc life expectency (vim) can | 110 | the GC overhead later. Each type of distinc life expectency (vim) can |
111 | have a seperate segment open for writing. Each (level, vim) tupel can | 111 | have a separate segment open for writing. Each (level, vim) tupel can |
112 | be open just once. If an open segment with unknown vim is encountered | 112 | be open just once. If an open segment with unknown vim is encountered |
113 | at mount time, it is closed and ignored henceforth. | 113 | at mount time, it is closed and ignored henceforth. |
114 | 114 | ||
diff --git a/arch/arm/mach-s3c2443/clock.c b/arch/arm/mach-s3c2443/clock.c index 62cd4eaee01b..8a55e78f7090 100644 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c | |||
@@ -391,7 +391,7 @@ static struct clk clk_hsmmc = { | |||
391 | 391 | ||
392 | /* i2s_eplldiv | 392 | /* i2s_eplldiv |
393 | * | 393 | * |
394 | * This clock is the output from the I2S divisor of ESYSCLK, and is seperate | 394 | * This clock is the output from the I2S divisor of ESYSCLK, and is separate |
395 | * from the mux that comes after it (cannot merge into one single clock) | 395 | * from the mux that comes after it (cannot merge into one single clock) |
396 | */ | 396 | */ |
397 | 397 | ||
diff --git a/arch/arm/plat-samsung/include/plat/gpio-core.h b/arch/arm/plat-samsung/include/plat/gpio-core.h index 49ff406a7066..16643e3029fc 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-core.h +++ b/arch/arm/plat-samsung/include/plat/gpio-core.h | |||
@@ -97,7 +97,7 @@ extern void s3c_gpiolib_add(struct s3c_gpio_chip *chip); | |||
97 | * others = Special functions (dependant on bank) | 97 | * others = Special functions (dependant on bank) |
98 | * | 98 | * |
99 | * Note, since the code to deal with the case where there are two control | 99 | * Note, since the code to deal with the case where there are two control |
100 | * registers instead of one, we do not have a seperate set of function | 100 | * registers instead of one, we do not have a separate set of function |
101 | * (samsung_gpiolib_add_4bit2_chips)for each case. | 101 | * (samsung_gpiolib_add_4bit2_chips)for each case. |
102 | */ | 102 | */ |
103 | extern void samsung_gpiolib_add_4bit_chips(struct s3c_gpio_chip *chip, | 103 | extern void samsung_gpiolib_add_4bit_chips(struct s3c_gpio_chip *chip, |
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index a67a0030dd57..bed6de342ecc 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c | |||
@@ -181,7 +181,7 @@ struct ehci_hcd_omap { | |||
181 | void __iomem *ehci_base; | 181 | void __iomem *ehci_base; |
182 | 182 | ||
183 | /* Regulators for USB PHYs. | 183 | /* Regulators for USB PHYs. |
184 | * Each PHY can have a seperate regulator. | 184 | * Each PHY can have a separate regulator. |
185 | */ | 185 | */ |
186 | struct regulator *regulator[OMAP3_HS_USB_PORTS]; | 186 | struct regulator *regulator[OMAP3_HS_USB_PORTS]; |
187 | }; | 187 | }; |
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c index 2396a85c0f55..72d1893ddd36 100644 --- a/fs/logfs/dir.c +++ b/fs/logfs/dir.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Atomic dir operations | 12 | * Atomic dir operations |
13 | * | 13 | * |
14 | * Directory operations are by default not atomic. Dentries and Inodes are | 14 | * Directory operations are by default not atomic. Dentries and Inodes are |
15 | * created/removed/altered in seperate operations. Therefore we need to do | 15 | * created/removed/altered in separate operations. Therefore we need to do |
16 | * a small amount of journaling. | 16 | * a small amount of journaling. |
17 | * | 17 | * |
18 | * Create, link, mkdir, mknod and symlink all share the same function to do | 18 | * Create, link, mkdir, mknod and symlink all share the same function to do |
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index 0a3df1a0c936..9028d7f83bbd 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h | |||
@@ -704,7 +704,7 @@ static inline gc_level_t expand_level(u64 ino, level_t __level) | |||
704 | u8 level = (__force u8)__level; | 704 | u8 level = (__force u8)__level; |
705 | 705 | ||
706 | if (ino == LOGFS_INO_MASTER) { | 706 | if (ino == LOGFS_INO_MASTER) { |
707 | /* ifile has seperate areas */ | 707 | /* ifile has separate areas */ |
708 | level += LOGFS_MAX_LEVELS; | 708 | level += LOGFS_MAX_LEVELS; |
709 | } | 709 | } |
710 | return (__force gc_level_t)level; | 710 | return (__force gc_level_t)level; |
diff --git a/fs/logfs/logfs_abi.h b/fs/logfs/logfs_abi.h index f674725663fe..ae960519c54a 100644 --- a/fs/logfs/logfs_abi.h +++ b/fs/logfs/logfs_abi.h | |||
@@ -50,9 +50,9 @@ static inline void check_##type(void) \ | |||
50 | * 12 - gc recycled blocks, long-lived data | 50 | * 12 - gc recycled blocks, long-lived data |
51 | * 13 - replacement blocks, short-lived data | 51 | * 13 - replacement blocks, short-lived data |
52 | * | 52 | * |
53 | * Levels 1-11 are necessary for robust gc operations and help seperate | 53 | * Levels 1-11 are necessary for robust gc operations and help separate |
54 | * short-lived metadata from longer-lived file data. In the future, | 54 | * short-lived metadata from longer-lived file data. In the future, |
55 | * file data should get seperated into several segments based on simple | 55 | * file data should get separated into several segments based on simple |
56 | * heuristics. Old data recycled during gc operation is expected to be | 56 | * heuristics. Old data recycled during gc operation is expected to be |
57 | * long-lived. New data is of uncertain life expectancy. New data | 57 | * long-lived. New data is of uncertain life expectancy. New data |
58 | * used to replace older blocks in existing files is expected to be | 58 | * used to replace older blocks in existing files is expected to be |
@@ -117,7 +117,7 @@ static inline void check_##type(void) \ | |||
117 | #define pure_ofs(ofs) (ofs & ~LOGFS_FULLY_POPULATED) | 117 | #define pure_ofs(ofs) (ofs & ~LOGFS_FULLY_POPULATED) |
118 | 118 | ||
119 | /* | 119 | /* |
120 | * LogFS needs to seperate data into levels. Each level is defined as the | 120 | * LogFS needs to separate data into levels. Each level is defined as the |
121 | * maximal possible distance from the master inode (inode of the inode file). | 121 | * maximal possible distance from the master inode (inode of the inode file). |
122 | * Data blocks reside on level 0, 1x indirect block on level 1, etc. | 122 | * Data blocks reside on level 0, 1x indirect block on level 1, etc. |
123 | * Inodes reside on level 6, indirect blocks for the inode file on levels 7-11. | 123 | * Inodes reside on level 6, indirect blocks for the inode file on levels 7-11. |
@@ -204,7 +204,7 @@ SIZE_CHECK(logfs_segment_header, LOGFS_SEGMENT_HEADERSIZE); | |||
204 | * @ds_crc: crc32 of structure starting with the next field | 204 | * @ds_crc: crc32 of structure starting with the next field |
205 | * @ds_ifile_levels: maximum number of levels for ifile | 205 | * @ds_ifile_levels: maximum number of levels for ifile |
206 | * @ds_iblock_levels: maximum number of levels for regular files | 206 | * @ds_iblock_levels: maximum number of levels for regular files |
207 | * @ds_data_levels: number of seperate levels for data | 207 | * @ds_data_levels: number of separate levels for data |
208 | * @pad0: reserved, must be 0 | 208 | * @pad0: reserved, must be 0 |
209 | * @ds_feature_incompat: incompatible filesystem features | 209 | * @ds_feature_incompat: incompatible filesystem features |
210 | * @ds_feature_ro_compat: read-only compatible filesystem features | 210 | * @ds_feature_ro_compat: read-only compatible filesystem features |
@@ -456,7 +456,7 @@ enum logfs_vim { | |||
456 | * @vim: life expectancy of data | 456 | * @vim: life expectancy of data |
457 | * | 457 | * |
458 | * "Areas" are segments currently being used for writing. There is at least | 458 | * "Areas" are segments currently being used for writing. There is at least |
459 | * one area per GC level. Several may be used to seperate long-living from | 459 | * one area per GC level. Several may be used to separate long-living from |
460 | * short-living data. If an area with unknown vim is encountered, it can | 460 | * short-living data. If an area with unknown vim is encountered, it can |
461 | * simply be closed. | 461 | * simply be closed. |
462 | * The write buffer immediately follow this header. | 462 | * The write buffer immediately follow this header. |