diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 12:06:36 -0400 |
commit | 99dbb1632f1165c2726056ebfce6edde0e5a0208 (patch) | |
tree | 2b2fc83db20b4c6d13842496899774b0dc2868e2 /fs | |
parent | aae6f989c6e97ff8197717fa4d032ad4eba091a7 (diff) | |
parent | 9c33c512b2d3167a3580659942ee78437b1b1bc6 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina:
"Tiny usual fixes all over the place"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
doc: fix old config name of kprobetrace
fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
btrfs: fix the commment for the action flags in delayed-ref.h
btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
vfs: fix kerneldoc for generic_fh_to_parent()
treewide: fix comment/printk/variable typos
ipr: fix small coding style issues
doc: fix broken utf8 encoding
nfs: comment fix
platform/x86: fix asus_laptop.wled_type module parameter
mfd: printk/comment fixes
doc: getdelays.c: remember to close() socket on error in create_nl_socket()
doc: aliasing-test: close fd on write error
mmc: fix comment typos
dma: fix comments
spi: fix comment/printk typos in spi
Coccinelle: fix typo in memdup_user.cocci
tmiofb: missing NULL pointer checks
tools: perf: Fix typo in tools/perf
tools/testing: fix comment / output typos
...
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/ctree.h | 2 | ||||
-rw-r--r-- | fs/btrfs/delayed-ref.h | 2 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 4 | ||||
-rw-r--r-- | fs/ext2/balloc.c | 2 | ||||
-rw-r--r-- | fs/ext3/balloc.c | 2 | ||||
-rw-r--r-- | fs/ext3/inode.c | 2 | ||||
-rw-r--r-- | fs/ext4/inode.c | 14 | ||||
-rw-r--r-- | fs/ext4/mballoc.c | 2 | ||||
-rw-r--r-- | fs/fs-writeback.c | 4 | ||||
-rw-r--r-- | fs/libfs.c | 2 | ||||
-rw-r--r-- | fs/nfs/super.c | 2 |
11 files changed, 17 insertions, 21 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0d195b507660..9821b672f5a2 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -116,7 +116,7 @@ struct btrfs_ordered_sum; | |||
116 | #define BTRFS_FREE_SPACE_OBJECTID -11ULL | 116 | #define BTRFS_FREE_SPACE_OBJECTID -11ULL |
117 | 117 | ||
118 | /* | 118 | /* |
119 | * The inode number assigned to the special inode for sotring | 119 | * The inode number assigned to the special inode for storing |
120 | * free ino cache | 120 | * free ino cache |
121 | */ | 121 | */ |
122 | #define BTRFS_FREE_INO_OBJECTID -12ULL | 122 | #define BTRFS_FREE_INO_OBJECTID -12ULL |
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h index ab5300595847..c9d703693df0 100644 --- a/fs/btrfs/delayed-ref.h +++ b/fs/btrfs/delayed-ref.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #ifndef __DELAYED_REF__ | 18 | #ifndef __DELAYED_REF__ |
19 | #define __DELAYED_REF__ | 19 | #define __DELAYED_REF__ |
20 | 20 | ||
21 | /* these are the possible values of struct btrfs_delayed_ref->action */ | 21 | /* these are the possible values of struct btrfs_delayed_ref_node->action */ |
22 | #define BTRFS_ADD_DELAYED_REF 1 /* add one backref to the tree */ | 22 | #define BTRFS_ADD_DELAYED_REF 1 /* add one backref to the tree */ |
23 | #define BTRFS_DROP_DELAYED_REF 2 /* delete one backref from the tree */ | 23 | #define BTRFS_DROP_DELAYED_REF 2 /* delete one backref from the tree */ |
24 | #define BTRFS_ADD_DELAYED_EXTENT 3 /* record a full extent allocation */ | 24 | #define BTRFS_ADD_DELAYED_EXTENT 3 /* record a full extent allocation */ |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index ec154f954646..316b07a866d2 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -1971,8 +1971,8 @@ out: | |||
1971 | ordered_extent->len - 1, NULL, GFP_NOFS); | 1971 | ordered_extent->len - 1, NULL, GFP_NOFS); |
1972 | 1972 | ||
1973 | /* | 1973 | /* |
1974 | * This needs to be dont to make sure anybody waiting knows we are done | 1974 | * This needs to be done to make sure anybody waiting knows we are done |
1975 | * upating everything for this ordered extent. | 1975 | * updating everything for this ordered extent. |
1976 | */ | 1976 | */ |
1977 | btrfs_remove_ordered_extent(inode, ordered_extent); | 1977 | btrfs_remove_ordered_extent(inode, ordered_extent); |
1978 | 1978 | ||
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index 376aa77f3ca7..2616d0ea5c5c 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c | |||
@@ -479,7 +479,7 @@ void ext2_discard_reservation(struct inode *inode) | |||
479 | /** | 479 | /** |
480 | * ext2_free_blocks() -- Free given blocks and update quota and i_blocks | 480 | * ext2_free_blocks() -- Free given blocks and update quota and i_blocks |
481 | * @inode: inode | 481 | * @inode: inode |
482 | * @block: start physcial block to free | 482 | * @block: start physical block to free |
483 | * @count: number of blocks to free | 483 | * @count: number of blocks to free |
484 | */ | 484 | */ |
485 | void ext2_free_blocks (struct inode * inode, unsigned long block, | 485 | void ext2_free_blocks (struct inode * inode, unsigned long block, |
diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index 90d901f0486b..7320a66e958f 100644 --- a/fs/ext3/balloc.c +++ b/fs/ext3/balloc.c | |||
@@ -483,7 +483,7 @@ void ext3_discard_reservation(struct inode *inode) | |||
483 | * ext3_free_blocks_sb() -- Free given blocks and update quota | 483 | * ext3_free_blocks_sb() -- Free given blocks and update quota |
484 | * @handle: handle to this transaction | 484 | * @handle: handle to this transaction |
485 | * @sb: super block | 485 | * @sb: super block |
486 | * @block: start physcial block to free | 486 | * @block: start physical block to free |
487 | * @count: number of blocks to free | 487 | * @count: number of blocks to free |
488 | * @pdquot_freed_blocks: pointer to quota | 488 | * @pdquot_freed_blocks: pointer to quota |
489 | */ | 489 | */ |
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index ff574b4e345e..7e87e37a372a 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
@@ -3207,7 +3207,7 @@ out_brelse: | |||
3207 | * | 3207 | * |
3208 | * - Within generic_file_write() for O_SYNC files. | 3208 | * - Within generic_file_write() for O_SYNC files. |
3209 | * Here, there will be no transaction running. We wait for any running | 3209 | * Here, there will be no transaction running. We wait for any running |
3210 | * trasnaction to commit. | 3210 | * transaction to commit. |
3211 | * | 3211 | * |
3212 | * - Within sys_sync(), kupdate and such. | 3212 | * - Within sys_sync(), kupdate and such. |
3213 | * We wait on commit, if tol to. | 3213 | * We wait on commit, if tol to. |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index dff171c3a123..c862ee5fe79d 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -3313,7 +3313,7 @@ int ext4_discard_partial_page_buffers(handle_t *handle, | |||
3313 | * handle: The journal handle | 3313 | * handle: The journal handle |
3314 | * inode: The files inode | 3314 | * inode: The files inode |
3315 | * page: A locked page that contains the offset "from" | 3315 | * page: A locked page that contains the offset "from" |
3316 | * from: The starting byte offset (from the begining of the file) | 3316 | * from: The starting byte offset (from the beginning of the file) |
3317 | * to begin discarding | 3317 | * to begin discarding |
3318 | * len: The length of bytes to discard | 3318 | * len: The length of bytes to discard |
3319 | * flags: Optional flags that may be used: | 3319 | * flags: Optional flags that may be used: |
@@ -3321,11 +3321,11 @@ int ext4_discard_partial_page_buffers(handle_t *handle, | |||
3321 | * EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED | 3321 | * EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED |
3322 | * Only zero the regions of the page whose buffer heads | 3322 | * Only zero the regions of the page whose buffer heads |
3323 | * have already been unmapped. This flag is appropriate | 3323 | * have already been unmapped. This flag is appropriate |
3324 | * for updateing the contents of a page whose blocks may | 3324 | * for updating the contents of a page whose blocks may |
3325 | * have already been released, and we only want to zero | 3325 | * have already been released, and we only want to zero |
3326 | * out the regions that correspond to those released blocks. | 3326 | * out the regions that correspond to those released blocks. |
3327 | * | 3327 | * |
3328 | * Returns zero on sucess or negative on failure. | 3328 | * Returns zero on success or negative on failure. |
3329 | */ | 3329 | */ |
3330 | static int ext4_discard_partial_page_buffers_no_lock(handle_t *handle, | 3330 | static int ext4_discard_partial_page_buffers_no_lock(handle_t *handle, |
3331 | struct inode *inode, struct page *page, loff_t from, | 3331 | struct inode *inode, struct page *page, loff_t from, |
@@ -3486,7 +3486,7 @@ int ext4_can_truncate(struct inode *inode) | |||
3486 | * @offset: The offset where the hole will begin | 3486 | * @offset: The offset where the hole will begin |
3487 | * @len: The length of the hole | 3487 | * @len: The length of the hole |
3488 | * | 3488 | * |
3489 | * Returns: 0 on sucess or negative on failure | 3489 | * Returns: 0 on success or negative on failure |
3490 | */ | 3490 | */ |
3491 | 3491 | ||
3492 | int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) | 3492 | int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) |
@@ -4008,7 +4008,7 @@ static int ext4_inode_blocks_set(handle_t *handle, | |||
4008 | 4008 | ||
4009 | if (i_blocks <= ~0U) { | 4009 | if (i_blocks <= ~0U) { |
4010 | /* | 4010 | /* |
4011 | * i_blocks can be represnted in a 32 bit variable | 4011 | * i_blocks can be represented in a 32 bit variable |
4012 | * as multiple of 512 bytes | 4012 | * as multiple of 512 bytes |
4013 | */ | 4013 | */ |
4014 | raw_inode->i_blocks_lo = cpu_to_le32(i_blocks); | 4014 | raw_inode->i_blocks_lo = cpu_to_le32(i_blocks); |
@@ -4169,7 +4169,7 @@ out_brelse: | |||
4169 | * | 4169 | * |
4170 | * - Within generic_file_write() for O_SYNC files. | 4170 | * - Within generic_file_write() for O_SYNC files. |
4171 | * Here, there will be no transaction running. We wait for any running | 4171 | * Here, there will be no transaction running. We wait for any running |
4172 | * trasnaction to commit. | 4172 | * transaction to commit. |
4173 | * | 4173 | * |
4174 | * - Within sys_sync(), kupdate and such. | 4174 | * - Within sys_sync(), kupdate and such. |
4175 | * We wait on commit, if tol to. | 4175 | * We wait on commit, if tol to. |
@@ -4413,7 +4413,7 @@ static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk) | |||
4413 | * worse case, the indexs blocks spread over different block groups | 4413 | * worse case, the indexs blocks spread over different block groups |
4414 | * | 4414 | * |
4415 | * If datablocks are discontiguous, they are possible to spread over | 4415 | * If datablocks are discontiguous, they are possible to spread over |
4416 | * different block groups too. If they are contiuguous, with flexbg, | 4416 | * different block groups too. If they are contiguous, with flexbg, |
4417 | * they could still across block group boundary. | 4417 | * they could still across block group boundary. |
4418 | * | 4418 | * |
4419 | * Also account for superblock, inode, quota and xattr blocks | 4419 | * Also account for superblock, inode, quota and xattr blocks |
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 8eae94771c45..08778f6cdfe9 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -4709,7 +4709,7 @@ error_return: | |||
4709 | * ext4_group_add_blocks() -- Add given blocks to an existing group | 4709 | * ext4_group_add_blocks() -- Add given blocks to an existing group |
4710 | * @handle: handle to this transaction | 4710 | * @handle: handle to this transaction |
4711 | * @sb: super block | 4711 | * @sb: super block |
4712 | * @block: start physcial block to add to the block group | 4712 | * @block: start physical block to add to the block group |
4713 | * @count: number of blocks to free | 4713 | * @count: number of blocks to free |
4714 | * | 4714 | * |
4715 | * This marks the blocks as free in the bitmap and buddy. | 4715 | * This marks the blocks as free in the bitmap and buddy. |
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index be3efc4f64f4..6d46c0d78338 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
@@ -577,10 +577,6 @@ static long writeback_chunk_size(struct backing_dev_info *bdi, | |||
577 | /* | 577 | /* |
578 | * Write a portion of b_io inodes which belong to @sb. | 578 | * Write a portion of b_io inodes which belong to @sb. |
579 | * | 579 | * |
580 | * If @only_this_sb is true, then find and write all such | ||
581 | * inodes. Otherwise write only ones which go sequentially | ||
582 | * in reverse order. | ||
583 | * | ||
584 | * Return the number of pages and/or inodes written. | 580 | * Return the number of pages and/or inodes written. |
585 | */ | 581 | */ |
586 | static long writeback_sb_inodes(struct super_block *sb, | 582 | static long writeback_sb_inodes(struct super_block *sb, |
diff --git a/fs/libfs.c b/fs/libfs.c index a74cb1725ac6..7cc37ca19cd8 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
@@ -874,7 +874,7 @@ struct dentry *generic_fh_to_dentry(struct super_block *sb, struct fid *fid, | |||
874 | EXPORT_SYMBOL_GPL(generic_fh_to_dentry); | 874 | EXPORT_SYMBOL_GPL(generic_fh_to_dentry); |
875 | 875 | ||
876 | /** | 876 | /** |
877 | * generic_fh_to_dentry - generic helper for the fh_to_parent export operation | 877 | * generic_fh_to_parent - generic helper for the fh_to_parent export operation |
878 | * @sb: filesystem to do the file handle conversion on | 878 | * @sb: filesystem to do the file handle conversion on |
879 | * @fid: file handle to convert | 879 | * @fid: file handle to convert |
880 | * @fh_len: length of the file handle in bytes | 880 | * @fh_len: length of the file handle in bytes |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index b8eda700584b..d2c7f5db0847 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -1537,7 +1537,7 @@ static int nfs_parse_mount_options(char *raw, | |||
1537 | 1537 | ||
1538 | /* | 1538 | /* |
1539 | * verify that any proto=/mountproto= options match the address | 1539 | * verify that any proto=/mountproto= options match the address |
1540 | * familiies in the addr=/mountaddr= options. | 1540 | * families in the addr=/mountaddr= options. |
1541 | */ | 1541 | */ |
1542 | if (protofamily != AF_UNSPEC && | 1542 | if (protofamily != AF_UNSPEC && |
1543 | protofamily != mnt->nfs_server.address.ss_family) | 1543 | protofamily != mnt->nfs_server.address.ss_family) |