diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-08 16:21:22 -0500 |
commit | 98793265b429a3f0b3f1750e74d67cd4d740d162 (patch) | |
tree | b0bd717673f0c21845cf053f3fb6b75d42530af5 /fs | |
parent | b4a133da2eaccb844a7beaef16ffd9c76a0d21d3 (diff) | |
parent | bd1b2a555952d959f47169056fca05acf7eff81f (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: (53 commits)
Kconfig: acpi: Fix typo in comment.
misc latin1 to utf8 conversions
devres: Fix a typo in devm_kfree comment
btrfs: free-space-cache.c: remove extra semicolon.
fat: Spelling s/obsolate/obsolete/g
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
tools/power turbostat: update fields in manpage
mac80211: drop spelling fix
types.h: fix comment spelling for 'architectures'
typo fixes: aera -> area, exntension -> extension
devices.txt: Fix typo of 'VMware'.
sis900: Fix enum typo 'sis900_rx_bufer_status'
decompress_bunzip2: remove invalid vi modeline
treewide: Fix comment and string typo 'bufer'
hyper-v: Update MAINTAINERS
treewide: Fix typos in various parts of the kernel, and fix some comments.
clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
leds: Kconfig: Fix typo 'D2NET_V2'
sound: Kconfig: drop unknown symbol ARCH_CLPS7500
...
Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/free-space-cache.c | 2 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 2 | ||||
-rw-r--r-- | fs/ext3/inode.c | 2 | ||||
-rw-r--r-- | fs/ext4/inode.c | 4 | ||||
-rw-r--r-- | fs/fat/inode.c | 26 | ||||
-rw-r--r-- | fs/jbd/checkpoint.c | 2 | ||||
-rw-r--r-- | fs/jbd2/checkpoint.c | 2 | ||||
-rw-r--r-- | fs/namespace.c | 2 | ||||
-rw-r--r-- | fs/nfsd/nfs4state.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/file.c | 2 | ||||
-rw-r--r-- | fs/qnx4/inode.c | 7 | ||||
-rw-r--r-- | fs/xfs/xfs_buf.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_file.c | 6 | ||||
-rw-r--r-- | fs/xfs/xfs_log_cil.c | 2 |
14 files changed, 31 insertions, 32 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index ec23d43d0c35..9a897bf79538 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c | |||
@@ -423,7 +423,7 @@ static void io_ctl_set_crc(struct io_ctl *io_ctl, int index) | |||
423 | } | 423 | } |
424 | 424 | ||
425 | if (index == 0) | 425 | if (index == 0) |
426 | offset = sizeof(u32) * io_ctl->num_pages;; | 426 | offset = sizeof(u32) * io_ctl->num_pages; |
427 | 427 | ||
428 | crc = btrfs_csum_data(io_ctl->root, io_ctl->orig + offset, crc, | 428 | crc = btrfs_csum_data(io_ctl->root, io_ctl->orig + offset, crc, |
429 | PAGE_CACHE_SIZE - offset); | 429 | PAGE_CACHE_SIZE - offset); |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 2f426a51e60d..81b235a61f8c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -1944,7 +1944,7 @@ enum btrfs_orphan_cleanup_state { | |||
1944 | }; | 1944 | }; |
1945 | 1945 | ||
1946 | /* | 1946 | /* |
1947 | * This is called in transaction commmit time. If there are no orphan | 1947 | * This is called in transaction commit time. If there are no orphan |
1948 | * files in the subvolume, it removes orphan item and frees block_rsv | 1948 | * files in the subvolume, it removes orphan item and frees block_rsv |
1949 | * structure. | 1949 | * structure. |
1950 | */ | 1950 | */ |
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 85fe655fe3e0..15cb47088aac 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c | |||
@@ -2490,7 +2490,7 @@ int ext3_can_truncate(struct inode *inode) | |||
2490 | * transaction, and VFS/VM ensures that ext3_truncate() cannot run | 2490 | * transaction, and VFS/VM ensures that ext3_truncate() cannot run |
2491 | * simultaneously on behalf of the same inode. | 2491 | * simultaneously on behalf of the same inode. |
2492 | * | 2492 | * |
2493 | * As we work through the truncate and commmit bits of it to the journal there | 2493 | * As we work through the truncate and commit bits of it to the journal there |
2494 | * is one core, guiding principle: the file's tree must always be consistent on | 2494 | * is one core, guiding principle: the file's tree must always be consistent on |
2495 | * disk. We must be able to restart the truncate after a crash. | 2495 | * disk. We must be able to restart the truncate after a crash. |
2496 | * | 2496 | * |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 92655fd89657..7dbcc3e84570 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -1881,7 +1881,7 @@ static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate); | |||
1881 | * a[0] = 'a'; | 1881 | * a[0] = 'a'; |
1882 | * truncate(f, 4096); | 1882 | * truncate(f, 4096); |
1883 | * we have in the page first buffer_head mapped via page_mkwrite call back | 1883 | * we have in the page first buffer_head mapped via page_mkwrite call back |
1884 | * but other bufer_heads would be unmapped but dirty(dirty done via the | 1884 | * but other buffer_heads would be unmapped but dirty (dirty done via the |
1885 | * do_wp_page). So writepage should write the first block. If we modify | 1885 | * do_wp_page). So writepage should write the first block. If we modify |
1886 | * the mmap area beyond 1024 we will again get a page_fault and the | 1886 | * the mmap area beyond 1024 we will again get a page_fault and the |
1887 | * page_mkwrite callback will do the block allocation and mark the | 1887 | * page_mkwrite callback will do the block allocation and mark the |
@@ -3469,7 +3469,7 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) | |||
3469 | * transaction, and VFS/VM ensures that ext4_truncate() cannot run | 3469 | * transaction, and VFS/VM ensures that ext4_truncate() cannot run |
3470 | * simultaneously on behalf of the same inode. | 3470 | * simultaneously on behalf of the same inode. |
3471 | * | 3471 | * |
3472 | * As we work through the truncate and commmit bits of it to the journal there | 3472 | * As we work through the truncate and commit bits of it to the journal there |
3473 | * is one core, guiding principle: the file's tree must always be consistent on | 3473 | * is one core, guiding principle: the file's tree must always be consistent on |
3474 | * disk. We must be able to restart the truncate after a crash. | 3474 | * disk. We must be able to restart the truncate after a crash. |
3475 | * | 3475 | * |
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 7873797cc76a..3ab841054d53 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -897,7 +897,7 @@ enum { | |||
897 | Opt_charset, Opt_shortname_lower, Opt_shortname_win95, | 897 | Opt_charset, Opt_shortname_lower, Opt_shortname_win95, |
898 | Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes, | 898 | Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes, |
899 | Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes, | 899 | Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes, |
900 | Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont, | 900 | Opt_obsolete, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont, |
901 | Opt_err_panic, Opt_err_ro, Opt_discard, Opt_err, | 901 | Opt_err_panic, Opt_err_ro, Opt_discard, Opt_err, |
902 | }; | 902 | }; |
903 | 903 | ||
@@ -927,17 +927,17 @@ static const match_table_t fat_tokens = { | |||
927 | {Opt_err_panic, "errors=panic"}, | 927 | {Opt_err_panic, "errors=panic"}, |
928 | {Opt_err_ro, "errors=remount-ro"}, | 928 | {Opt_err_ro, "errors=remount-ro"}, |
929 | {Opt_discard, "discard"}, | 929 | {Opt_discard, "discard"}, |
930 | {Opt_obsolate, "conv=binary"}, | 930 | {Opt_obsolete, "conv=binary"}, |
931 | {Opt_obsolate, "conv=text"}, | 931 | {Opt_obsolete, "conv=text"}, |
932 | {Opt_obsolate, "conv=auto"}, | 932 | {Opt_obsolete, "conv=auto"}, |
933 | {Opt_obsolate, "conv=b"}, | 933 | {Opt_obsolete, "conv=b"}, |
934 | {Opt_obsolate, "conv=t"}, | 934 | {Opt_obsolete, "conv=t"}, |
935 | {Opt_obsolate, "conv=a"}, | 935 | {Opt_obsolete, "conv=a"}, |
936 | {Opt_obsolate, "fat=%u"}, | 936 | {Opt_obsolete, "fat=%u"}, |
937 | {Opt_obsolate, "blocksize=%u"}, | 937 | {Opt_obsolete, "blocksize=%u"}, |
938 | {Opt_obsolate, "cvf_format=%20s"}, | 938 | {Opt_obsolete, "cvf_format=%20s"}, |
939 | {Opt_obsolate, "cvf_options=%100s"}, | 939 | {Opt_obsolete, "cvf_options=%100s"}, |
940 | {Opt_obsolate, "posix"}, | 940 | {Opt_obsolete, "posix"}, |
941 | {Opt_err, NULL}, | 941 | {Opt_err, NULL}, |
942 | }; | 942 | }; |
943 | static const match_table_t msdos_tokens = { | 943 | static const match_table_t msdos_tokens = { |
@@ -1169,7 +1169,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat, | |||
1169 | break; | 1169 | break; |
1170 | 1170 | ||
1171 | /* obsolete mount options */ | 1171 | /* obsolete mount options */ |
1172 | case Opt_obsolate: | 1172 | case Opt_obsolete: |
1173 | fat_msg(sb, KERN_INFO, "\"%s\" option is obsolete, " | 1173 | fat_msg(sb, KERN_INFO, "\"%s\" option is obsolete, " |
1174 | "not supported now", p); | 1174 | "not supported now", p); |
1175 | break; | 1175 | break; |
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index f94fc48ff3a0..5d1a00a5041b 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c | |||
@@ -537,7 +537,7 @@ int cleanup_journal_tail(journal_t *journal) | |||
537 | * them. | 537 | * them. |
538 | * | 538 | * |
539 | * Called with j_list_lock held. | 539 | * Called with j_list_lock held. |
540 | * Returns number of bufers reaped (for debug) | 540 | * Returns number of buffers reaped (for debug) |
541 | */ | 541 | */ |
542 | 542 | ||
543 | static int journal_clean_one_cp_list(struct journal_head *jh, int *released) | 543 | static int journal_clean_one_cp_list(struct journal_head *jh, int *released) |
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 16a698bd906d..d49d202903fb 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c | |||
@@ -565,7 +565,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal) | |||
565 | * | 565 | * |
566 | * Called with the journal locked. | 566 | * Called with the journal locked. |
567 | * Called with j_list_lock held. | 567 | * Called with j_list_lock held. |
568 | * Returns number of bufers reaped (for debug) | 568 | * Returns number of buffers reaped (for debug) |
569 | */ | 569 | */ |
570 | 570 | ||
571 | static int journal_clean_one_cp_list(struct journal_head *jh, int *released) | 571 | static int journal_clean_one_cp_list(struct journal_head *jh, int *released) |
diff --git a/fs/namespace.c b/fs/namespace.c index 7e6f2c9dc7c4..e6081996c9a2 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -324,9 +324,7 @@ int mnt_want_write(struct vfsmount *m) | |||
324 | if (mnt_is_readonly(m)) { | 324 | if (mnt_is_readonly(m)) { |
325 | mnt_dec_writers(mnt); | 325 | mnt_dec_writers(mnt); |
326 | ret = -EROFS; | 326 | ret = -EROFS; |
327 | goto out; | ||
328 | } | 327 | } |
329 | out: | ||
330 | preempt_enable(); | 328 | preempt_enable(); |
331 | return ret; | 329 | return ret; |
332 | } | 330 | } |
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 47e94e33a975..9ca16dc09e04 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -658,7 +658,7 @@ static int nfsd4_sanitize_slot_size(u32 size) | |||
658 | /* | 658 | /* |
659 | * XXX: If we run out of reserved DRC memory we could (up to a point) | 659 | * XXX: If we run out of reserved DRC memory we could (up to a point) |
660 | * re-negotiate active sessions and reduce their slot usage to make | 660 | * re-negotiate active sessions and reduce their slot usage to make |
661 | * rooom for new connections. For now we just fail the create session. | 661 | * room for new connections. For now we just fail the create session. |
662 | */ | 662 | */ |
663 | static int nfsd4_get_drc_mem(int slotsize, u32 num) | 663 | static int nfsd4_get_drc_mem(int slotsize, u32 num) |
664 | { | 664 | { |
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 6e396683c3d4..061591a3ab08 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -2128,7 +2128,7 @@ static int ocfs2_prepare_inode_for_write(struct file *file, | |||
2128 | * remove_suid() calls ->setattr without any hint that | 2128 | * remove_suid() calls ->setattr without any hint that |
2129 | * we may have already done our cluster locking. Since | 2129 | * we may have already done our cluster locking. Since |
2130 | * ocfs2_setattr() *must* take cluster locks to | 2130 | * ocfs2_setattr() *must* take cluster locks to |
2131 | * proceeed, this will lead us to recursively lock the | 2131 | * proceed, this will lead us to recursively lock the |
2132 | * inode. There's also the dinode i_size state which | 2132 | * inode. There's also the dinode i_size state which |
2133 | * can be lost via setattr during extending writes (we | 2133 | * can be lost via setattr during extending writes (we |
2134 | * set inode->i_size at the end of a write. */ | 2134 | * set inode->i_size at the end of a write. */ |
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index b90c7967fcae..2bfd987f4853 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -199,12 +199,13 @@ static const char *qnx4_checkroot(struct super_block *sb) | |||
199 | if (!strcmp(rootdir->di_fname, | 199 | if (!strcmp(rootdir->di_fname, |
200 | QNX4_BMNAME)) { | 200 | QNX4_BMNAME)) { |
201 | found = 1; | 201 | found = 1; |
202 | qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL ); | 202 | qnx4_sb(sb)->BitMap = kmemdup(rootdir, |
203 | sizeof(struct qnx4_inode_entry), | ||
204 | GFP_KERNEL); | ||
203 | if (!qnx4_sb(sb)->BitMap) { | 205 | if (!qnx4_sb(sb)->BitMap) { |
204 | brelse (bh); | 206 | brelse (bh); |
205 | return "not enough memory for bitmap inode"; | 207 | return "not enough memory for bitmap inode"; |
206 | } | 208 | }/* keep bitmap inode known */ |
207 | memcpy( qnx4_sb(sb)->BitMap, rootdir, sizeof( struct qnx4_inode_entry ) ); /* keep bitmap inode known */ | ||
208 | break; | 209 | break; |
209 | } | 210 | } |
210 | } | 211 | } |
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index ce6249dae90c..4dff85c7d7eb 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c | |||
@@ -1370,7 +1370,7 @@ restart: | |||
1370 | goto restart; | 1370 | goto restart; |
1371 | } | 1371 | } |
1372 | /* | 1372 | /* |
1373 | * clear the LRU reference count so the bufer doesn't get | 1373 | * clear the LRU reference count so the buffer doesn't get |
1374 | * ignored in xfs_buf_rele(). | 1374 | * ignored in xfs_buf_rele(). |
1375 | */ | 1375 | */ |
1376 | atomic_set(&bp->b_lru_ref, 0); | 1376 | atomic_set(&bp->b_lru_ref, 0); |
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 753ed9b5c70b..f675f3d9d7b3 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c | |||
@@ -209,10 +209,10 @@ xfs_file_fsync( | |||
209 | 209 | ||
210 | /* | 210 | /* |
211 | * First check if the VFS inode is marked dirty. All the dirtying | 211 | * First check if the VFS inode is marked dirty. All the dirtying |
212 | * of non-transactional updates no goes through mark_inode_dirty*, | 212 | * of non-transactional updates do not go through mark_inode_dirty*, |
213 | * which allows us to distinguish beteeen pure timestamp updates | 213 | * which allows us to distinguish between pure timestamp updates |
214 | * and i_size updates which need to be caught for fdatasync. | 214 | * and i_size updates which need to be caught for fdatasync. |
215 | * After that also theck for the dirty state in the XFS inode, which | 215 | * After that also check for the dirty state in the XFS inode, which |
216 | * might gets cleared when the inode gets written out via the AIL | 216 | * might gets cleared when the inode gets written out via the AIL |
217 | * or xfs_iflush_cluster. | 217 | * or xfs_iflush_cluster. |
218 | */ | 218 | */ |
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index 26db6b13f1f9..d4fadbe8ac90 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c | |||
@@ -279,7 +279,7 @@ xfs_cil_prepare_item( | |||
279 | * Insert the log items into the CIL and calculate the difference in space | 279 | * Insert the log items into the CIL and calculate the difference in space |
280 | * consumed by the item. Add the space to the checkpoint ticket and calculate | 280 | * consumed by the item. Add the space to the checkpoint ticket and calculate |
281 | * if the change requires additional log metadata. If it does, take that space | 281 | * if the change requires additional log metadata. If it does, take that space |
282 | * as well. Remove the amount of space we addded to the checkpoint ticket from | 282 | * as well. Remove the amount of space we added to the checkpoint ticket from |
283 | * the current transaction ticket so that the accounting works out correctly. | 283 | * the current transaction ticket so that the accounting works out correctly. |
284 | */ | 284 | */ |
285 | static void | 285 | static void |