aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:58:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:58:52 -0500
commitf5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch)
tree7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /fs
parent9853832c49dc1685587abeb4e1decd4be690d256 (diff)
parent1560a79a2c2ea0c3826150da8029991d685de990 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits) Jesper Juhl is the new trivial patches maintainer Documentation: mention email-clients.txt in SubmittingPatches fs/binfmt_elf.c: spello fix do_invalidatepage() comment typo fix Documentation/filesystems/porting fixes typo fixes in net/core/net_namespace.c typo fix in net/rfkill/rfkill.c typo fixes in net/sctp/sm_statefuns.c lib/: Spelling fixes kernel/: Spelling fixes include/scsi/: Spelling fixes include/linux/: Spelling fixes include/asm-m68knommu/: Spelling fixes include/asm-frv/: Spelling fixes fs/: Spelling fixes drivers/watchdog/: Spelling fixes drivers/video/: Spelling fixes drivers/ssb/: Spelling fixes drivers/serial/: Spelling fixes drivers/scsi/: Spelling fixes ...
Diffstat (limited to 'fs')
-rw-r--r--fs/befs/btree.c2
-rw-r--r--fs/befs/datastream.c2
-rw-r--r--fs/binfmt_elf.c2
-rw-r--r--fs/freevxfs/vxfs_dir.h2
-rw-r--r--fs/freevxfs/vxfs_immed.c2
-rw-r--r--fs/gfs2/recovery.c2
-rw-r--r--fs/jffs2/readinode.c2
-rw-r--r--fs/jfs/jfs_xtree.c2
-rw-r--r--fs/ocfs2/alloc.c2
-rw-r--r--fs/ocfs2/dir.c2
-rw-r--r--fs/ocfs2/ocfs1_fs_compat.h2
-rw-r--r--fs/ocfs2/suballoc.c2
-rw-r--r--fs/reiserfs/bitmap.c6
-rw-r--r--fs/signalfd.c2
14 files changed, 16 insertions, 16 deletions
diff --git a/fs/befs/btree.c b/fs/befs/btree.c
index af5bb93276f8..4202db7496cb 100644
--- a/fs/befs/btree.c
+++ b/fs/befs/btree.c
@@ -232,7 +232,7 @@ befs_bt_read_node(struct super_block *sb, befs_data_stream * ds,
232 * @key: Key string to lookup in btree 232 * @key: Key string to lookup in btree
233 * @value: Value stored with @key 233 * @value: Value stored with @key
234 * 234 *
235 * On sucess, returns BEFS_OK and sets *@value to the value stored 235 * On success, returns BEFS_OK and sets *@value to the value stored
236 * with @key (usually the disk block number of an inode). 236 * with @key (usually the disk block number of an inode).
237 * 237 *
238 * On failure, returns BEFS_ERR or BEFS_BT_NOT_FOUND. 238 * On failure, returns BEFS_ERR or BEFS_BT_NOT_FOUND.
diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c
index aacb4da6298a..e3287d0d1a58 100644
--- a/fs/befs/datastream.c
+++ b/fs/befs/datastream.c
@@ -236,7 +236,7 @@ befs_count_blocks(struct super_block * sb, befs_data_stream * ds)
236 as in the indirect region code). 236 as in the indirect region code).
237 237
238 When/if blockno is found, if blockno is inside of a block 238 When/if blockno is found, if blockno is inside of a block
239 run as stored on disk, we offset the start and lenght members 239 run as stored on disk, we offset the start and length members
240 of the block run, so that blockno is the start and len is 240 of the block run, so that blockno is the start and len is
241 still valid (the run ends in the same place). 241 still valid (the run ends in the same place).
242 242
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 18ed6dd906c1..4628c42ca892 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -117,7 +117,7 @@ static int padzero(unsigned long elf_bss)
117 return 0; 117 return 0;
118} 118}
119 119
120/* Let's use some macros to make this stack manipulation a litle clearer */ 120/* Let's use some macros to make this stack manipulation a little clearer */
121#ifdef CONFIG_STACK_GROWSUP 121#ifdef CONFIG_STACK_GROWSUP
122#define STACK_ADD(sp, items) ((elf_addr_t __user *)(sp) + (items)) 122#define STACK_ADD(sp, items) ((elf_addr_t __user *)(sp) + (items))
123#define STACK_ROUND(sp, items) \ 123#define STACK_ROUND(sp, items) \
diff --git a/fs/freevxfs/vxfs_dir.h b/fs/freevxfs/vxfs_dir.h
index 3c96d6e63978..aaf1fb098639 100644
--- a/fs/freevxfs/vxfs_dir.h
+++ b/fs/freevxfs/vxfs_dir.h
@@ -41,7 +41,7 @@
41 * VxFS directory block header. 41 * VxFS directory block header.
42 * 42 *
43 * This entry is the head of every filesystem block in a directory. 43 * This entry is the head of every filesystem block in a directory.
44 * It is used for free space managment and additionally includes 44 * It is used for free space management and additionally includes
45 * a hash for speeding up directory search (lookup). 45 * a hash for speeding up directory search (lookup).
46 * 46 *
47 * The hash may be empty and in fact we do not use it all in the 47 * The hash may be empty and in fact we do not use it all in the
diff --git a/fs/freevxfs/vxfs_immed.c b/fs/freevxfs/vxfs_immed.c
index 24b5a775ff96..8a5959a61ba9 100644
--- a/fs/freevxfs/vxfs_immed.c
+++ b/fs/freevxfs/vxfs_immed.c
@@ -54,7 +54,7 @@ const struct inode_operations vxfs_immed_symlink_iops = {
54}; 54};
55 55
56/* 56/*
57 * Adress space operations for immed files and directories. 57 * Address space operations for immed files and directories.
58 */ 58 */
59const struct address_space_operations vxfs_immed_aops = { 59const struct address_space_operations vxfs_immed_aops = {
60 .readpage = vxfs_immed_readpage, 60 .readpage = vxfs_immed_readpage,
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index b249e294a95b..6fb07d67ca8a 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -450,7 +450,7 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd)
450 fs_info(sdp, "jid=%u: Trying to acquire journal lock...\n", 450 fs_info(sdp, "jid=%u: Trying to acquire journal lock...\n",
451 jd->jd_jid); 451 jd->jd_jid);
452 452
453 /* Aquire the journal lock so we can do recovery */ 453 /* Acquire the journal lock so we can do recovery */
454 454
455 error = gfs2_glock_nq_num(sdp, jd->jd_jid, &gfs2_journal_glops, 455 error = gfs2_glock_nq_num(sdp, jd->jd_jid, &gfs2_journal_glops,
456 LM_ST_EXCLUSIVE, 456 LM_ST_EXCLUSIVE,
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 2eae5d2dbebe..6c1ba3566f58 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -741,7 +741,7 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
741 * are not obsolete. 741 * are not obsolete.
742 * 742 *
743 * Of course, this optimization only makes sense in case 743 * Of course, this optimization only makes sense in case
744 * of NAND flashes (or other flashes whith 744 * of NAND flashes (or other flashes with
745 * !jffs2_can_mark_obsolete()), since on NOR flashes 745 * !jffs2_can_mark_obsolete()), since on NOR flashes
746 * nodes are marked obsolete physically. 746 * nodes are marked obsolete physically.
747 * 747 *
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 1543906a2e0d..a000aaa75136 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -3965,7 +3965,7 @@ s64 xtTruncate(tid_t tid, struct inode *ip, s64 newsize, int flag)
3965 * xtTruncate_pmap() 3965 * xtTruncate_pmap()
3966 * 3966 *
3967 * function: 3967 * function:
3968 * Perform truncate to zero lenghth for deleted file, leaving the 3968 * Perform truncate to zero length for deleted file, leaving the
3969 * the xtree and working map untouched. This allows the file to 3969 * the xtree and working map untouched. This allows the file to
3970 * be accessed via open file handles, while the delete of the file 3970 * be accessed via open file handles, while the delete of the file
3971 * is committed to disk. 3971 * is committed to disk.
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index e6df06ac6405..64713e149e46 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -3338,7 +3338,7 @@ static int ocfs2_insert_path(struct inode *inode,
3338 if (insert->ins_split != SPLIT_NONE) { 3338 if (insert->ins_split != SPLIT_NONE) {
3339 /* 3339 /*
3340 * We could call ocfs2_insert_at_leaf() for some types 3340 * We could call ocfs2_insert_at_leaf() for some types
3341 * of splits, but it's easier to just let one seperate 3341 * of splits, but it's easier to just let one separate
3342 * function sort it all out. 3342 * function sort it all out.
3343 */ 3343 */
3344 ocfs2_split_record(inode, left_path, right_path, 3344 ocfs2_split_record(inode, left_path, right_path,
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 6b0107f21344..e280833ceb9a 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -1215,7 +1215,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh,
1215 down_write(&oi->ip_alloc_sem); 1215 down_write(&oi->ip_alloc_sem);
1216 1216
1217 /* 1217 /*
1218 * Prepare for worst case allocation scenario of two seperate 1218 * Prepare for worst case allocation scenario of two separate
1219 * extents. 1219 * extents.
1220 */ 1220 */
1221 if (alloc == 2) 1221 if (alloc == 2)
diff --git a/fs/ocfs2/ocfs1_fs_compat.h b/fs/ocfs2/ocfs1_fs_compat.h
index 0b499bccec5a..dfb313bda5dd 100644
--- a/fs/ocfs2/ocfs1_fs_compat.h
+++ b/fs/ocfs2/ocfs1_fs_compat.h
@@ -77,7 +77,7 @@ struct ocfs1_disk_lock
77{ 77{
78/*00*/ __u32 curr_master; 78/*00*/ __u32 curr_master;
79 __u8 file_lock; 79 __u8 file_lock;
80 __u8 compat_pad[3]; /* Not in orignal definition. Used to 80 __u8 compat_pad[3]; /* Not in original definition. Used to
81 make the already existing alignment 81 make the already existing alignment
82 explicit */ 82 explicit */
83 __u64 last_write_time; 83 __u64 last_write_time;
diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
index 7e397e2c25dd..72c198a004df 100644
--- a/fs/ocfs2/suballoc.c
+++ b/fs/ocfs2/suballoc.c
@@ -646,7 +646,7 @@ bail:
646 * sync-data inodes." 646 * sync-data inodes."
647 * 647 *
648 * Note: OCFS2 already does this differently for metadata vs data 648 * Note: OCFS2 already does this differently for metadata vs data
649 * allocations, as those bitmaps are seperate and undo access is never 649 * allocations, as those bitmaps are separate and undo access is never
650 * called on a metadata group descriptor. 650 * called on a metadata group descriptor.
651 */ 651 */
652static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh, 652static int ocfs2_test_bg_bit_allocatable(struct buffer_head *bg_bh,
diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index 16b331dd9913..f491ceb5af02 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -272,7 +272,7 @@ static inline int block_group_used(struct super_block *s, u32 id)
272 272
273 /* If we don't have cached information on this bitmap block, we're 273 /* If we don't have cached information on this bitmap block, we're
274 * going to have to load it later anyway. Loading it here allows us 274 * going to have to load it later anyway. Loading it here allows us
275 * to make a better decision. This favors long-term performace gain 275 * to make a better decision. This favors long-term performance gain
276 * with a better on-disk layout vs. a short term gain of skipping the 276 * with a better on-disk layout vs. a short term gain of skipping the
277 * read and potentially having a bad placement. */ 277 * read and potentially having a bad placement. */
278 if (info->free_count == UINT_MAX) { 278 if (info->free_count == UINT_MAX) {
@@ -663,7 +663,7 @@ static inline void new_hashed_relocation(reiserfs_blocknr_hint_t * hint)
663 663
664/* 664/*
665 * Relocation based on dirid, hashing them into a given bitmap block 665 * Relocation based on dirid, hashing them into a given bitmap block
666 * files. Formatted nodes are unaffected, a seperate policy covers them 666 * files. Formatted nodes are unaffected, a separate policy covers them
667 */ 667 */
668static void dirid_groups(reiserfs_blocknr_hint_t * hint) 668static void dirid_groups(reiserfs_blocknr_hint_t * hint)
669{ 669{
@@ -688,7 +688,7 @@ static void dirid_groups(reiserfs_blocknr_hint_t * hint)
688 688
689/* 689/*
690 * Relocation based on oid, hashing them into a given bitmap block 690 * Relocation based on oid, hashing them into a given bitmap block
691 * files. Formatted nodes are unaffected, a seperate policy covers them 691 * files. Formatted nodes are unaffected, a separate policy covers them
692 */ 692 */
693static void oid_groups(reiserfs_blocknr_hint_t * hint) 693static void oid_groups(reiserfs_blocknr_hint_t * hint)
694{ 694{
diff --git a/fs/signalfd.c b/fs/signalfd.c
index fb7f7e8034df..2d3e107da2d3 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -66,7 +66,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
66 BUILD_BUG_ON(sizeof(struct signalfd_siginfo) != 128); 66 BUILD_BUG_ON(sizeof(struct signalfd_siginfo) != 128);
67 67
68 /* 68 /*
69 * Unused memebers should be zero ... 69 * Unused members should be zero ...
70 */ 70 */
71 err = __clear_user(uinfo, sizeof(*uinfo)); 71 err = __clear_user(uinfo, sizeof(*uinfo));
72 72