diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
tree | 21264cc26fa0322d668b398808f10bd93558d25f /fs | |
parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'fs')
-rw-r--r-- | fs/9p/mux.c | 2 | ||||
-rw-r--r-- | fs/aio.c | 2 | ||||
-rw-r--r-- | fs/jffs2/summary.c | 2 | ||||
-rw-r--r-- | fs/jfs/jfs_extent.c | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/fs/9p/mux.c b/fs/9p/mux.c index f4407eb276c7..12e1baa4508d 100644 --- a/fs/9p/mux.c +++ b/fs/9p/mux.c | |||
@@ -712,7 +712,7 @@ static void v9fs_read_work(void *a) | |||
712 | * v9fs_send_request - send 9P request | 712 | * v9fs_send_request - send 9P request |
713 | * The function can sleep until the request is scheduled for sending. | 713 | * The function can sleep until the request is scheduled for sending. |
714 | * The function can be interrupted. Return from the function is not | 714 | * The function can be interrupted. Return from the function is not |
715 | * a guarantee that the request is sent succesfully. Can return errors | 715 | * a guarantee that the request is sent successfully. Can return errors |
716 | * that can be retrieved by PTR_ERR macros. | 716 | * that can be retrieved by PTR_ERR macros. |
717 | * | 717 | * |
718 | * @m: mux data | 718 | * @m: mux data |
@@ -641,7 +641,7 @@ static inline int __queue_kicked_iocb(struct kiocb *iocb) | |||
641 | * invoked both for initial i/o submission and | 641 | * invoked both for initial i/o submission and |
642 | * subsequent retries via the aio_kick_handler. | 642 | * subsequent retries via the aio_kick_handler. |
643 | * Expects to be invoked with iocb->ki_ctx->lock | 643 | * Expects to be invoked with iocb->ki_ctx->lock |
644 | * already held. The lock is released and reaquired | 644 | * already held. The lock is released and reacquired |
645 | * as needed during processing. | 645 | * as needed during processing. |
646 | * | 646 | * |
647 | * Calls the iocb retry method (already setup for the | 647 | * Calls the iocb retry method (already setup for the |
diff --git a/fs/jffs2/summary.c b/fs/jffs2/summary.c index 0b02fc79e4d1..be1acc3dad97 100644 --- a/fs/jffs2/summary.c +++ b/fs/jffs2/summary.c | |||
@@ -43,7 +43,7 @@ int jffs2_sum_init(struct jffs2_sb_info *c) | |||
43 | return -ENOMEM; | 43 | return -ENOMEM; |
44 | } | 44 | } |
45 | 45 | ||
46 | dbg_summary("returned succesfully\n"); | 46 | dbg_summary("returned successfully\n"); |
47 | 47 | ||
48 | return 0; | 48 | return 0; |
49 | } | 49 | } |
diff --git a/fs/jfs/jfs_extent.c b/fs/jfs/jfs_extent.c index 5549378358bf..4d52593a5fc6 100644 --- a/fs/jfs/jfs_extent.c +++ b/fs/jfs/jfs_extent.c | |||
@@ -126,7 +126,7 @@ extAlloc(struct inode *ip, s64 xlen, s64 pno, xad_t * xp, boolean_t abnr) | |||
126 | 126 | ||
127 | /* allocate the disk blocks for the extent. initially, extBalloc() | 127 | /* allocate the disk blocks for the extent. initially, extBalloc() |
128 | * will try to allocate disk blocks for the requested size (xlen). | 128 | * will try to allocate disk blocks for the requested size (xlen). |
129 | * if this fails (xlen contigious free blocks not avaliable), it'll | 129 | * if this fails (xlen contiguous free blocks not avaliable), it'll |
130 | * try to allocate a smaller number of blocks (producing a smaller | 130 | * try to allocate a smaller number of blocks (producing a smaller |
131 | * extent), with this smaller number of blocks consisting of the | 131 | * extent), with this smaller number of blocks consisting of the |
132 | * requested number of blocks rounded down to the next smaller | 132 | * requested number of blocks rounded down to the next smaller |
@@ -493,7 +493,7 @@ int extFill(struct inode *ip, xad_t * xp) | |||
493 | * | 493 | * |
494 | * initially, we will try to allocate disk blocks for the | 494 | * initially, we will try to allocate disk blocks for the |
495 | * requested size (nblocks). if this fails (nblocks | 495 | * requested size (nblocks). if this fails (nblocks |
496 | * contigious free blocks not avaliable), we'll try to allocate | 496 | * contiguous free blocks not avaliable), we'll try to allocate |
497 | * a smaller number of blocks (producing a smaller extent), with | 497 | * a smaller number of blocks (producing a smaller extent), with |
498 | * this smaller number of blocks consisting of the requested | 498 | * this smaller number of blocks consisting of the requested |
499 | * number of blocks rounded down to the next smaller power of 2 | 499 | * number of blocks rounded down to the next smaller power of 2 |
@@ -529,7 +529,7 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno) | |||
529 | 529 | ||
530 | /* get the number of blocks to initially attempt to allocate. | 530 | /* get the number of blocks to initially attempt to allocate. |
531 | * we'll first try the number of blocks requested unless this | 531 | * we'll first try the number of blocks requested unless this |
532 | * number is greater than the maximum number of contigious free | 532 | * number is greater than the maximum number of contiguous free |
533 | * blocks in the map. in that case, we'll start off with the | 533 | * blocks in the map. in that case, we'll start off with the |
534 | * maximum free. | 534 | * maximum free. |
535 | */ | 535 | */ |
@@ -586,7 +586,7 @@ extBalloc(struct inode *ip, s64 hint, s64 * nblocks, s64 * blkno) | |||
586 | * in place. if this fails, we'll try to move the extent | 586 | * in place. if this fails, we'll try to move the extent |
587 | * to a new set of blocks. if moving the extent, we initially | 587 | * to a new set of blocks. if moving the extent, we initially |
588 | * will try to allocate disk blocks for the requested size | 588 | * will try to allocate disk blocks for the requested size |
589 | * (nnew). if this fails (nnew contigious free blocks not | 589 | * (nnew). if this fails (new contiguous free blocks not |
590 | * avaliable), we'll try to allocate a smaller number of | 590 | * avaliable), we'll try to allocate a smaller number of |
591 | * blocks (producing a smaller extent), with this smaller | 591 | * blocks (producing a smaller extent), with this smaller |
592 | * number of blocks consisting of the requested number of | 592 | * number of blocks consisting of the requested number of |