commit 4363f0f244607c536badb17a950bfd95c5f3d0c9
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 a11796c..cd6a22b 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 be6f49d..9b125dc 100644
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -195,7 +195,7 @@ static void cleanup_file(struct file *file)
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 08aa934..9f96e3f 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
@@ -437,7 +437,7 @@ static int copyup_named_dentry(struct inode *dir, struct
dentry *dentry,
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, struct file *file, int
bstart,
}
/*
- * 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 * upper, struct
dentry * lower,
}
/*
- * 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,
@@ -725,7 +725,7 @@ static struct dentry *create_parents_named(struct inode
*dir,
} 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 c0802cb..6a016cd 100644
--- a/fs/unionfs/file.c
+++ b/fs/unionfs/file.c
@@ -151,7 +151,7 @@ static unsigned int unionfs_poll(struct file *file,
poll_table * wait)
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 c69f079..094b2b9 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -664,7 +664,7 @@ static int unionfs_permission(struct inode *inode, int mask,
/*
* 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 2cc731e..fd4bc0a 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -146,7 +146,7 @@ struct dentry *unionfs_lookup_backend(struct dentry
*dentry, struct nameidata *n
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(struct dentry
*dentry, struct nameidata *n
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 4652559..98fb9ad 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 c34f9a2..965d730 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 4c58c6f..6d64733 100644
--- a/fs/unionfs/sioq.h
+++ b/fs/unionfs/sioq.h
@@ -111,7 +111,7 @@ extern void wake_up_and_wait_sioa(struct sioa_args *args);
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 97b6ed5..373b43e 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -641,7 +641,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.
*******************************************************************/
/*
@@ -730,7 +730,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 vfsmount *mnt, int
flags)
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 019910f..5a7ce64 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -283,7 +283,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
