commit 986d50d72733f49b5e0042b9fdc9c6df703d4523
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date:   Sat Apr 21 11:55:24 2007 -0400

    cleanup: spell check all strings and comments
    
    Conflicts:
    
        fs/unionfs/inode.c
        fs/unionfs/rename.c

diff --git a/fs/unionfs/branchman.c b/fs/unionfs/branchman.c
index 
a11796ca8fa4257663bcf1fb398e9546792e6170..cd6a22bfb3670dd4c7f9c453fabf3b4835c2e811
 100644
--- a/fs/unionfs/branchman.c
+++ b/fs/unionfs/branchman.c
@@ -19,7 +19,7 @@
 #include "union.h"
 
 /*
- * return to userspace the branch indices containing the file in question
+ * return to user-space the branch indices containing the file in question
  *
  * We use fd_set and therefore we are limited to the number of the branches
  * to FD_SETSIZE, which is currently 1024 - plenty for most people
diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 
be6f49da9f4b8ade2d86d4cd9b8a69717c12522f..9b125dc92c01896e5a9140ba712bf1e3d8b0f47a
 100644
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -195,7 +195,7 @@ static void cleanup_file(struct file *fi
                        int i;  /* holds (possibly) updated branch index */
                        i = find_new_branch_index(file, bindex, sb);
                        if (i < 0)
-                               printk(KERN_ERR "unionfs: no supberlock for "
+                               printk(KERN_ERR "unionfs: no superblock for "
                                       "file %p\n", file);
                        else {
                                unionfs_read_lock(sb);
diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index 
8ac31106a6318cec983a814ec3933a56eeffbff2..c2d6a3603a3d589e3e2b54f1de17c06b47a6c457
 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -437,7 +437,7 @@ #ifdef CONFIG_UNION_FS_XATTR
                goto out_unlink;
 #endif
 
-       /* do not allow files getting deleted to be reinterposed */
+       /* do not allow files getting deleted to be re-interposed */
        if (!d_deleted(dentry))
                unionfs_reinterpose(dentry);
 
@@ -465,7 +465,7 @@ out_unlink:
        /*
         * TODO: should we reset the error to something like -EIO?
         *
-        * If we don't reset, the user may get some non-sensical errors, but
+        * If we don't reset, the user may get some nonsensical errors, but
         * on the other hand, if we reset to EIO, we guarantee that the user
         * will get a "confusing" error message.
         */
@@ -477,7 +477,7 @@ out_free:
        /*
         * If old_hidden_dentry was a directory, we need to dput it.  If it
         * was a file, then it was already dput indirectly by other
-        * functions we call ablve which operate on regular files.
+        * functions we call above which operate on regular files.
         */
        if (old_hidden_dentry && old_hidden_dentry->d_inode &&
            S_ISDIR(old_hidden_dentry->d_inode->i_mode))
@@ -531,7 +531,7 @@ int copyup_file(struct inode *dir, struc
 }
 
 /*
- * This function replicates the directory structure upto given dentry in the
+ * This function replicates the directory structure up-to given dentry in the
  * bindex branch. Can create directory structure recursively to the right
  * also.
  */
@@ -616,7 +616,7 @@ static void __set_dentry(struct dentry *
 }
 
 /*
- * This function replicates the directory structure upto given dentry
+ * This function replicates the directory structure up-to given dentry
  * in the bindex branch.
  */
 static struct dentry *create_parents_named(struct inode *dir,
@@ -732,7 +732,7 @@ static struct dentry *create_parents_nam
                } else {
 
                        /*
-                        * is the name a whiteout of the childname ?
+                        * is the name a whiteout of the child name ?
                         * lookup the whiteout child in the underlying file
                         * system
                         */
diff --git a/fs/unionfs/file.c b/fs/unionfs/file.c
index 
c0802cb7f64d79be5b36daf4958e682cc686cf09..6a016cdaba7ec646602974c1b21c8eaf5d7d7f86
 100644
--- a/fs/unionfs/file.c
+++ b/fs/unionfs/file.c
@@ -151,7 +151,7 @@ static unsigned int unionfs_poll(struct 
 
        unionfs_read_lock(file->f_dentry->d_sb);
        if (unionfs_file_revalidate(file, 0)) {
-               /* We should pretend an error happend. */
+               /* We should pretend an error happened. */
                mask = POLLERR | POLLIN | POLLOUT;
                goto out;
        }
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 
7bf811c381da01335576a46728c1bdccbca11b5f..513ecd370e292775614290fce49bd81aa4e1a51b
 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -665,7 +665,7 @@ static int unionfs_permission(struct ino
 
                /*
                 * check the condition for D-F-D underlying files/directories,
-                * we dont have to check for files, if we are checking for
+                * we don't have to check for files, if we are checking for
                 * directories.
                 */
                if (!is_file && !S_ISDIR(hidden_inode->i_mode))
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 
124f717c19c531aa4ed909d073d9d6bdd8d689d0..ae62b6ea594dcc31bdb3db3cd27279cf0def2ec2
 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -146,7 +146,7 @@ struct dentry *unionfs_lookup_backend(st
                                first_hidden_dentry = hidden_dentry;
                                /*
                                 * FIXME: following line needs to be changed
-                                * to allow mountpoint crossing
+                                * to allow mount-point crossing
                                 */
                                first_dentry = parent_dentry;
                                first_hidden_mnt =
@@ -167,7 +167,7 @@ struct dentry *unionfs_lookup_backend(st
                unionfs_set_lower_dentry_idx(dentry, bindex, hidden_dentry);
                /*
                 * FIXME: the following line needs to get fixed to allow
-                * mountpoint crossing
+                * mount-point crossing
                 */
                unionfs_set_lower_mnt_idx(dentry, bindex,
                                          unionfs_mntget(parent_dentry,
@@ -225,7 +225,7 @@ out_negative:
 
                /*
                 * FIXME: the following line needs to be changed to allow
-                * mountpoint crossing
+                * mount-point crossing
                 */
                first_dentry = dentry;
                first_hidden_mnt = unionfs_mntget(dentry, bindex);
@@ -255,7 +255,7 @@ out_positive:
        dput(first_hidden_dentry);
        unionfs_mntput(first_dentry, first_dentry_offset);
 
-       /* Partial lookups need to reinterpose, or throw away older negs. */
+       /* Partial lookups need to re-interpose, or throw away older negs. */
        if (lookupmode == INTERPOSE_PARTIAL) {
                err = odf_lookup(parent_dentry, dentry, 0);
                if (UNIONFS_D(dentry)->odf_info &&
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index 
465255987df16de47d9ccb59bdc8f1eaaf3f03f1..98fb9ad2fc1d2d5d575b6a3c9548cc93687d7d07
 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -520,7 +520,7 @@ out:
 }
 
 /*
- * our custom d_alloc_root workalike
+ * our custom d_alloc_root work-alike
  *
  * we can't use d_alloc_root if we want to use our own interpose function
  * unchanged, so we simply call our own "fake" d_alloc_root
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 
c34f9a2788703140b628d4f18e0a2c9c345619eb..965d730f8e44fe70c51ef12f171d3caee0105031
 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -116,7 +116,7 @@ out_unlock:
 
 out:
        if (!err) {
-               /* Fixup the newdentry. */
+               /* Fixup the new_dentry. */
                if (bindex < dbstart(new_dentry))
                        set_dbstart(new_dentry, bindex);
                else if (bindex > dbend(new_dentry))
@@ -285,7 +285,7 @@ revert_out:
 
 /* We can't copyup a directory, because it may involve huge
  * numbers of children, etc.  Doing that in the kernel would
- * be bad, so instead we let the userspace recurse and ask us
+ * be bad, so instead we let the user-space recurse and ask us
  * to copy up each file separately
  */
 static int may_rename_dir(struct dentry *dentry)
diff --git a/fs/unionfs/sioq.h b/fs/unionfs/sioq.h
index 
469ae2f521649e32c5b15b57828942be38857767..bc80a8a340ebb4f844d5767ac9b656a599d4454c
 100644
--- a/fs/unionfs/sioq.h
+++ b/fs/unionfs/sioq.h
@@ -96,7 +96,7 @@ extern void wake_up_and_wait_sioa(struct
 extern void wake_up_sioa(struct sioa_args *args);
 extern void complete_sioa(struct sioa_args *args);
 
-/* Extern definitions for our privlege escalation helpers */
+/* Extern definitions for our privilege escalation helpers */
 extern void __unionfs_create(struct work_struct *work);
 extern void __unionfs_mkdir(struct work_struct *work);
 extern void __unionfs_mknod(struct work_struct *work);
diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 
20bddda30d67efd142188730f0b282eaae03122e..9f82314d45fdc73cc85df62a68ba18d5a0e0c8d9
 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -640,7 +640,7 @@ out_no_change:
         * WE'RE ALMOST DONE: see if we need to allocate a small-sized new
         * vector, copy the vectors to their correct place, release the
         * refcnt of the older ones, and return.
-        * Also handle invalidating any pgaes that will have to be re-read.
+        * Also handle invalidating any pages that will have to be re-read.
         *******************************************************************/
 
        /*
@@ -729,7 +729,7 @@ out_no_change:
         * super.  This function calls invalidate_inode_pages(mapping),
         * which calls invalidate_mapping_pages(): the latter, however, will
         * not invalidate pages which are dirty, locked, under writeback, or
-        * mapped into pagetables.  We shouldn't have to worry about dirty
+        * mapped into page tables.  We shouldn't have to worry about dirty
         * or under-writeback pages, because do_remount_sb() called
         * fsync_super() which would not have returned until all dirty pages
         * were flushed.
@@ -922,8 +922,8 @@ static void unionfs_umount_begin(struct 
 
        if (!(flags & MNT_FORCE))
                /*
-                * we are not being MNT_FORCEd, therefore we should emulate
-                * old behaviour
+                * we are not being MNT_FORCE'd, therefore we should emulate
+                * old behavior
                 */
                return;
 
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 
02de3941c747a4edb1a1a09cda029eaecae4825d..41f06c1bf8e6312f4cf368b6f8dfe32ea99483e2
 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -272,7 +272,7 @@ void update_bstart(struct dentry *dentry
  * EXTERNALS:
  */
 
-/* replicates the directory structure upto given dentry in given branch */
+/* replicates the directory structure up to given dentry in given branch */
 extern struct dentry *create_parents(struct inode *dir, struct dentry *dentry,
                                     int bindex);
 
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs

Reply via email to