diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /fs | |
parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/relocation.c | 2 | ||||
-rw-r--r-- | fs/freevxfs/vxfs_inode.c | 2 | ||||
-rw-r--r-- | fs/logfs/readwrite.c | 2 | ||||
-rw-r--r-- | fs/nfsd/stats.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/refcounttree.c | 2 | ||||
-rw-r--r-- | fs/partitions/ldm.c | 2 | ||||
-rw-r--r-- | fs/squashfs/Kconfig | 4 | ||||
-rw-r--r-- | fs/squashfs/cache.c | 2 | ||||
-rw-r--r-- | fs/ufs/inode.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_inode.c | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 199a80134312..f340f7c99d09 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -709,7 +709,7 @@ again: | |||
709 | WARN_ON(cur->checked); | 709 | WARN_ON(cur->checked); |
710 | if (!list_empty(&cur->upper)) { | 710 | if (!list_empty(&cur->upper)) { |
711 | /* | 711 | /* |
712 | * the backref was added previously when processsing | 712 | * the backref was added previously when processing |
713 | * backref of type BTRFS_TREE_BLOCK_REF_KEY | 713 | * backref of type BTRFS_TREE_BLOCK_REF_KEY |
714 | */ | 714 | */ |
715 | BUG_ON(!list_is_singular(&cur->upper)); | 715 | BUG_ON(!list_is_singular(&cur->upper)); |
diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c index 2ba6719ac612..1a4311437a8b 100644 --- a/fs/freevxfs/vxfs_inode.c +++ b/fs/freevxfs/vxfs_inode.c | |||
@@ -272,7 +272,7 @@ vxfs_get_fake_inode(struct super_block *sbp, struct vxfs_inode_info *vip) | |||
272 | * *ip: VFS inode | 272 | * *ip: VFS inode |
273 | * | 273 | * |
274 | * Description: | 274 | * Description: |
275 | * vxfs_put_fake_inode frees all data asssociated with @ip. | 275 | * vxfs_put_fake_inode frees all data associated with @ip. |
276 | */ | 276 | */ |
277 | void | 277 | void |
278 | vxfs_put_fake_inode(struct inode *ip) | 278 | vxfs_put_fake_inode(struct inode *ip) |
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index 9e22085231b3..d8d09380c7de 100644 --- a/fs/logfs/readwrite.c +++ b/fs/logfs/readwrite.c | |||
@@ -481,7 +481,7 @@ static int inode_write_alias(struct super_block *sb, | |||
481 | val = inode_val0(inode); | 481 | val = inode_val0(inode); |
482 | break; | 482 | break; |
483 | case INODE_USED_OFS: | 483 | case INODE_USED_OFS: |
484 | val = cpu_to_be64(li->li_used_bytes);; | 484 | val = cpu_to_be64(li->li_used_bytes); |
485 | break; | 485 | break; |
486 | case INODE_SIZE_OFS: | 486 | case INODE_SIZE_OFS: |
487 | val = cpu_to_be64(i_size_read(inode)); | 487 | val = cpu_to_be64(i_size_read(inode)); |
diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c index 5232d3e8fb2f..a2e2402b2afb 100644 --- a/fs/nfsd/stats.c +++ b/fs/nfsd/stats.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * Statistsics for the reply cache | 8 | * Statistsics for the reply cache |
9 | * fh <stale> <total-lookups> <anonlookups> <dir-not-in-dcache> <nondir-not-in-dcache> | 9 | * fh <stale> <total-lookups> <anonlookups> <dir-not-in-dcache> <nondir-not-in-dcache> |
10 | * statistics for filehandle lookup | 10 | * statistics for filehandle lookup |
11 | * io <bytes-read> <bytes-writtten> | 11 | * io <bytes-read> <bytes-written> |
12 | * statistics for IO throughput | 12 | * statistics for IO throughput |
13 | * th <threads> <fullcnt> <10%-20%> <20%-30%> ... <90%-100%> <100%> | 13 | * th <threads> <fullcnt> <10%-20%> <20%-30%> ... <90%-100%> <100%> |
14 | * time (seconds) when nfsd thread usage above thresholds | 14 | * time (seconds) when nfsd thread usage above thresholds |
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 5d32749c896d..3c7606cff1ab 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c | |||
@@ -3706,7 +3706,7 @@ int ocfs2_refcount_cow_xattr(struct inode *inode, | |||
3706 | context->cow_start = cow_start; | 3706 | context->cow_start = cow_start; |
3707 | context->cow_len = cow_len; | 3707 | context->cow_len = cow_len; |
3708 | context->ref_tree = ref_tree; | 3708 | context->ref_tree = ref_tree; |
3709 | context->ref_root_bh = ref_root_bh;; | 3709 | context->ref_root_bh = ref_root_bh; |
3710 | context->cow_object = xv; | 3710 | context->cow_object = xv; |
3711 | 3711 | ||
3712 | context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd; | 3712 | context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd; |
diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c index a29d5ccf3d54..af9fdf046769 100644 --- a/fs/partitions/ldm.c +++ b/fs/partitions/ldm.c | |||
@@ -565,7 +565,7 @@ static bool ldm_validate_partition_table(struct parsed_partitions *state) | |||
565 | 565 | ||
566 | data = read_part_sector(state, 0, §); | 566 | data = read_part_sector(state, 0, §); |
567 | if (!data) { | 567 | if (!data) { |
568 | ldm_crit ("Disk read failed."); | 568 | ldm_info ("Disk read failed."); |
569 | return false; | 569 | return false; |
570 | } | 570 | } |
571 | 571 | ||
diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig index efc309fa3035..7797218d0b30 100644 --- a/fs/squashfs/Kconfig +++ b/fs/squashfs/Kconfig | |||
@@ -42,7 +42,7 @@ config SQUASHFS_LZO | |||
42 | select LZO_DECOMPRESS | 42 | select LZO_DECOMPRESS |
43 | help | 43 | help |
44 | Saying Y here includes support for reading Squashfs file systems | 44 | Saying Y here includes support for reading Squashfs file systems |
45 | compressed with LZO compresssion. LZO compression is mainly | 45 | compressed with LZO compression. LZO compression is mainly |
46 | aimed at embedded systems with slower CPUs where the overheads | 46 | aimed at embedded systems with slower CPUs where the overheads |
47 | of zlib are too high. | 47 | of zlib are too high. |
48 | 48 | ||
@@ -57,7 +57,7 @@ config SQUASHFS_XZ | |||
57 | select XZ_DEC | 57 | select XZ_DEC |
58 | help | 58 | help |
59 | Saying Y here includes support for reading Squashfs file systems | 59 | Saying Y here includes support for reading Squashfs file systems |
60 | compressed with XZ compresssion. XZ gives better compression than | 60 | compressed with XZ compression. XZ gives better compression than |
61 | the default zlib compression, at the expense of greater CPU and | 61 | the default zlib compression, at the expense of greater CPU and |
62 | memory overhead. | 62 | memory overhead. |
63 | 63 | ||
diff --git a/fs/squashfs/cache.c b/fs/squashfs/cache.c index c37b520132ff..4b5a3fbb1f1f 100644 --- a/fs/squashfs/cache.c +++ b/fs/squashfs/cache.c | |||
@@ -29,7 +29,7 @@ | |||
29 | * plus functions layered ontop of the generic cache implementation to | 29 | * plus functions layered ontop of the generic cache implementation to |
30 | * access the metadata and fragment caches. | 30 | * access the metadata and fragment caches. |
31 | * | 31 | * |
32 | * To avoid out of memory and fragmentation isssues with vmalloc the cache | 32 | * To avoid out of memory and fragmentation issues with vmalloc the cache |
33 | * uses sequences of kmalloced PAGE_CACHE_SIZE buffers. | 33 | * uses sequences of kmalloced PAGE_CACHE_SIZE buffers. |
34 | * | 34 | * |
35 | * It should be noted that the cache is not used for file datablocks, these | 35 | * It should be noted that the cache is not used for file datablocks, these |
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index e765743cf9f3..b4d791a83207 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c | |||
@@ -409,7 +409,7 @@ out: | |||
409 | } | 409 | } |
410 | 410 | ||
411 | /** | 411 | /** |
412 | * ufs_getfrag_bloc() - `get_block_t' function, interface between UFS and | 412 | * ufs_getfrag_block() - `get_block_t' function, interface between UFS and |
413 | * readpage, writepage and so on | 413 | * readpage, writepage and so on |
414 | */ | 414 | */ |
415 | 415 | ||
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index a37480a6e023..d11ce613d692 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -1470,7 +1470,7 @@ xfs_itruncate_finish( | |||
1470 | * file but the log buffers containing the free and reallocation | 1470 | * file but the log buffers containing the free and reallocation |
1471 | * don't, then we'd end up with garbage in the blocks being freed. | 1471 | * don't, then we'd end up with garbage in the blocks being freed. |
1472 | * As long as we make the new_size permanent before actually | 1472 | * As long as we make the new_size permanent before actually |
1473 | * freeing any blocks it doesn't matter if they get writtten to. | 1473 | * freeing any blocks it doesn't matter if they get written to. |
1474 | * | 1474 | * |
1475 | * The callers must signal into us whether or not the size | 1475 | * The callers must signal into us whether or not the size |
1476 | * setting here must be synchronous. There are a few cases | 1476 | * setting here must be synchronous. There are a few cases |