commit 02b7416950a17f12cd6fd0c4f663ed7ff8785420
Author: Erez_Zadok <[EMAIL PROTECTED]>
Date: Thu May 31 15:53:19 2007 -0400
spell check all strings and comments
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/config.c b/fs/unionfs/config.c
index a1001f7..00b99ca 100644
--- a/fs/unionfs/config.c
+++ b/fs/unionfs/config.c
@@ -49,7 +49,7 @@ static struct unionfs_attribute unionfs_attr_thresh_i_low = {
.val = THRESH_IL_DEF,
};
-/* group them for easy acces by all unionfs mounts */
+/* group them for easy access by all unionfs mounts */
static struct unionfs_attributes unionfs_attributes = {
.timeout = &unionfs_attr_timeout,
.thresh_b_high = &unionfs_attr_thresh_b_high,
diff --git a/fs/unionfs/dirfops.c b/fs/unionfs/dirfops.c
index d39e1c3..a47eacb 100644
--- a/fs/unionfs/dirfops.c
+++ b/fs/unionfs/dirfops.c
@@ -50,7 +50,7 @@ static int unionfs_readdir(struct file *file, void *dirent,
filldir_t filldir)
/* check if cached dir does not exist */
if (!odf_cache->d_inode || !odf_cache->d_inode->i_size) {
- /* odf cache dir calls partial lookup wich expects a locked
dentry */
+ /* odf cache dir calls partial lookup which expects a locked
dentry */
unionfs_lock_dentry(file->f_dentry);
err = odf_cache_dir(file->f_dentry, odf_cache,
&file->f_dentry->d_inode->i_mtime);
unionfs_unlock_dentry(file->f_dentry);
@@ -105,7 +105,7 @@ static int unionfs_readdir(struct file *file, void *dirent,
filldir_t filldir)
/* save the file position */
file->f_pos = odf_file->f_pos;
- /* If EOF is reached, we set the file pos to the max posible value
+ /* If EOF is reached, we set the file pos to the max possible value
* since the file pos must be greater than the size of the file as
* viewed through the union and also odf cached file as not to
* confuse unionfs_/nfs_readdir when EOF is reached
diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index 6b53e1b..cdce96d 100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
@@ -25,7 +25,7 @@
#define STACK_SIZE 64 /* initial size of the dentry stack */
-/* reallocs at double the size */
+/* reallocates at double the size */
int __odf_dstack_resize(struct dentry_stack *stack)
{
struct dentry **new_stack;
@@ -83,7 +83,7 @@ static int cleanup_util_callback(void *dirent, const char
*name, int namelen,
goto out;
/* remove dir cache files or all if files if cleaning
- * /odf/reclaim nad /odf/sr
+ * /odf/reclaim and /odf/sr
*/
if ((d_type == DT_REG && buf->mode != CLN_IC) ||
(namelen == ODF_CONTENT_LEN &&
@@ -153,7 +153,7 @@ static int readdir_util_callback(void *dirent, const char
*name, int namelen,
goto find;
}
- /* we dont care about odf when checking hidden dirs */
+ /* we don't care about odf when checking hidden dirs */
if (buf->mode == RD_CHECK_HD_EMPTY) {
err = -ENOTEMPTY;
goto out;
@@ -191,7 +191,7 @@ find:
goto out;
/* Ideally we would want all entries we find here to be in the
- * odf and have a persisten inode. However it is possible for the
+ * odf and have a persistent inode. However it is possible for the
* entries not to be in the odf yet, and thus not have a valid odf
* inode number. We could have created an entry in the odf at this
* point, but since we do not have a unionfs dentry here we wouldn't
diff --git a/fs/unionfs/fanout.h b/fs/unionfs/fanout.h
index 8dfc965..dd03a7c 100644
--- a/fs/unionfs/fanout.h
+++ b/fs/unionfs/fanout.h
@@ -58,7 +58,7 @@ static inline void new_branch_id(struct super_block *sb, int
index)
/*
* Find new index of matching branch with an existing superblock a a known
* (possibly old) id. This is needed because branches could have been
- * added/deleted causing the branchs of any open files to shift.
+ * added/deleted causing the branches of any open files to shift.
*
* @sb: the new superblock which may have new/different branch IDs
* @id: the old/existing id we're looking for
@@ -72,7 +72,7 @@ static inline int branch_id_to_idx(struct super_block *sb,
int id)
return i;
}
/*
- * Opaquness is stored in the odf using branch ids. The odf
+ * Opaqueness is stored in the odf using branch ids. The odf
* uses this function to translate the branch id to branch index.
* Since branch management causes some branch ids to change or be
* removed, this function can legally fail to find the branch id
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index 5063152..dcdd69a 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -185,7 +185,7 @@ static int unionfs_link(struct dentry *old_dentry, struct
inode *dir,
if (dbstart(old_dentry) > dbstart(new_dentry)) {
- /* dont copyup if new_dentry doesn't exist in union */
+ /* don't copyup if new_dentry doesn't exist in union */
if (dbstart(new_dentry) == 0 &&
dbstart(new_dentry) == dbend(new_dentry) &&
(!unionfs_lower_dentry_idx(new_dentry, 0) ||
@@ -447,7 +447,7 @@ static int unionfs_mkdir(struct inode *parent, struct
dentry *dentry, int mode)
unlock_dir(hidden_parent_dentry);
- /* did the mkdir suceed? */
+ /* did the mkdir succeed? */
if (err)
goto out;
diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
index c6e5a02..0b48dd4 100644
--- a/fs/unionfs/main.c
+++ b/fs/unionfs/main.c
@@ -732,7 +732,7 @@ static int unionfs_read_super(struct super_block *sb, void
*raw_data,
/* save /odf/ns as odf dentry for root */
dget(UNIONFS_SB(sb)->odf.ns);
UNIONFS_D(sb->s_root)->odf.dentry = UNIONFS_SB(sb)->odf.ns;
- UNIONFS_D(sb->s_root)->odf.opaque = -1; /* root can never be opq */
+ UNIONFS_D(sb->s_root)->odf.opaque = -1; /* root can never be opaque */
UNIONFS_D(sb->s_root)->odf.whiteout = 0; /* nor a whiteout */
/* Set the generation number to one, since this is for the mount. */
@@ -778,7 +778,7 @@ out_dput:
out_free_odf:
/* cleanup thread is not started,free it here so
- * odf_put_super doesnt wait for it */
+ * odf_put_super doesn't wait for it */
kfree(UNIONFS_SB(sb)->odf.cleanup);
UNIONFS_SB(sb)->odf.cleanup = NULL;
odf_put_super(&UNIONFS_SB(sb)->odf);
diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c
index c795915..82d4095 100644
--- a/fs/unionfs/mmap.c
+++ b/fs/unionfs/mmap.c
@@ -21,7 +21,7 @@
/*
* Unionfs doesn't implement ->writepages, which is OK with the VFS and
- * nkeeps our code simpler and smaller. Nevertheless, somehow, our own
+ * keeps our code simpler and smaller. Nevertheless, somehow, our own
* ->writepage must be called so we can sync the upper pages with the lower
* pages: otherwise data changed at the upper layer won't get written to the
* lower layer.
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index e10f21d..dc4d8e9 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -141,7 +141,7 @@ int odf_read_super(struct super_block *sb, char *data)
if (err)
goto out_free;
}
- /* dont allow dirs= options when odf is not new */
+ /* don't allow dirs= options when odf is not new */
else if (options & ODF_OPT_DIRS) {
printk(KERN_WARNING
"unionfs: dirs option not allowed with used odf\n");
@@ -346,7 +346,7 @@ int odf_parse_options(const char *options, char **odf_path)
if (!strcmp("dirs", optname))
err |= ODF_OPT_DIRS;
- /* dont throw error on unrecognized argsm because this will
+ /* don't throw error on unrecognized args because this will
* be caught by unionfs_parse_options, we should only be
* worried with options that affect the odf
*/
@@ -897,7 +897,7 @@ skip:
/* case 3:
* - dst to the right of src, because of moving branches, so if the
file was already
- * copied up before the branch manip. it would now be hidden by the
old non-cpied up
+ * copied up before the branch manipulation; it would now be hidden
by the old non-copied up
* version of the file.
* - Do nothing!
*/
@@ -950,7 +950,7 @@ out:
* odf_dentry_info, it is dput before the lookup.
*
* Upon success the given dentry's odf_dentry_info struct is filled with
- * the odf dentry, opaquness and whiteout flag.
+ * the odf dentry, opaqueness and whiteout flag.
*
* If the entry is not found in the odf, 0 is returned but the odf_dentry
* in the odf_dentry_info struct is set to NULL.
@@ -1072,7 +1072,7 @@ struct dentry *odf_lookup_name(struct dentry *parent,
const char *name, int len,
* links. If this is not NULL, lookup will make sure the looked
* up dentry is linked to the given link in the odf
*
- * XXX: whether link should be an odf or uniofs dentry should be
+ * XXX: whether link should be an odf or unionfs dentry should be
* decided when hardlinks are actually implemented
*/
struct dentry *__odf_lookup(struct dentry *parent,
@@ -1121,7 +1121,7 @@ struct dentry *__odf_lookup(struct dentry *parent,
if (flags & ODF_LOOKUP_WH)
BUG_ON(odf_dentry->d_inode && !__odf_is_wh(osi, odf_dentry));
- /* create an entry in the odf if dont exist */
+ /* create an entry in the odf if don't exist */
if (!odf_dentry->d_inode) {
if (name[0]=='.')
@@ -1251,7 +1251,7 @@ struct dentry *odf_ic_dentry(struct odf_sb_info *osi, u64
ino, char *name, int n
memset(tmp_name,0,6);
sprintf(tmp_name, "%x", breakdown[0]);
- /* look for/create the ##/##/##/## hiearachy */
+ /* look for/create the ##/##/##/## hierarchy */
dirs[0] = lookup_one_len(tmp_name, ic, strlen(tmp_name));
if (IS_ERR(dirs[0])) {
err = PTR_ERR(dirs[0]);
@@ -1504,7 +1504,7 @@ out:
*
* If the item to be removed has i_count > 1 it is silly renamed (moved
* to (/odf/sr). XXX: If there's any place where we don't want this
- * behaviour we can use an additional flag to this function.
+ * behavior we can use an additional flag to this function.
*/
int odf_remove(struct dentry *dentry, int flags)
{
@@ -1612,7 +1612,7 @@ int odf_is_new(struct odf_sb_info *osi)
/*
* Generates uuids for branches and makes sure branches belonging to the same
- * filesystem get the same uuid.
+ * file system get the same UUID.
*/
int odf_update_uuids(struct odf_sb_info *odf, struct path *old_paths, int
old_branches,
struct path *new_paths, int new_branches)
@@ -1638,7 +1638,7 @@ int odf_update_uuids(struct odf_sb_info *odf, struct path
*old_paths, int old_br
break;
}
- /* if yes, then give it the old uuid */
+ /* if yes, then give it the old UUID */
if (i != old_branches) {
memcpy(new_uuids + bindex * UUID_LEN,
old_uuids + i * UUID_LEN, UUID_LEN);
@@ -1655,7 +1655,7 @@ int odf_update_uuids(struct odf_sb_info *odf, struct path
*old_paths, int old_br
memcpy(new_uuids + bindex * UUID_LEN,
new_uuids + i * UUID_LEN, UUID_LEN);
- else /* if this is a new fs in the union give it a new uuid
*/
+ else /* if this is a new fs in the union give it a new UUID
*/
generate_random_uuid(new_uuids + bindex * UUID_LEN);
}
@@ -1671,7 +1671,7 @@ out:
* Superblock contains:
* odf version number, numbers of branches
* then for each branch:
- * branch id, ablosute path len, absolute path, perms, uuids
+ * branch id, absolute path len, absolute path, perms, uuids
*/
int odf_write_sb_data(struct odf_sb_info *osi, struct unionfs_data *data,
struct path *lower_paths, int branches)
{
@@ -1789,7 +1789,7 @@ int odf_write_sb_data(struct odf_sb_info *osi, struct
unionfs_data *data, struct
goto out_close;
}
- /* branch uuid */
+ /* branch UUID */
uuid = odf_get_branch_uuid(osi, bindex);
err = file->f_op->write(file, uuid, UUID_LEN, &file->f_pos);
if (err != UUID_LEN) {
@@ -1869,7 +1869,7 @@ char *odf_read_sb_data(struct odf_sb_info *odf_sb, int
**bid)
}
version = le32_to_cpu(le32);
- /* check version - dont allow different than current */
+ /* check version - don't allow different than current */
if (version != ODF_VERSION) {
printk(KERN_ERR
"unionfs: incompatible odf version "
@@ -1942,7 +1942,7 @@ char *odf_read_sb_data(struct odf_sb_info *odf_sb, int
**bid)
}
perms = le32_to_cpu(le32);
- /* branch uuid*/
+ /* branch UUID*/
err = file->f_op->read(file, (char*)uuid, UUID_LEN,
&file->f_pos);
if (err != UUID_LEN) {
err = -EIO;
diff --git a/fs/unionfs/odf_internals.h b/fs/unionfs/odf_internals.h
index 4deb1c9..b872548 100644
--- a/fs/unionfs/odf_internals.h
+++ b/fs/unionfs/odf_internals.h
@@ -21,7 +21,7 @@
#define ODF_IC "ic" /* inode cache dir (/odf/ic) */
#define ODF_RC "reclaim" /* reclaim dir (/odf/reclaim) */
#define ODF_NS "ns" /* namespace dir (/odf/ns) */
-#define ODF_SR "sr" /* sily rename dir (/odf/sr) */
+#define ODF_SR "sr" /* silly rename dir (/odf/sr) */
#define ODF_WH "whiteout" /* the file whiteouts are linked to */
/* Some string constants */
diff --git a/fs/unionfs/rename.c b/fs/unionfs/rename.c
index 57188a2..ac925c4 100644
--- a/fs/unionfs/rename.c
+++ b/fs/unionfs/rename.c
@@ -51,7 +51,7 @@ int copyup_empty_dir(struct inode *parent, struct dentry
*dentry, int mode)
unlock_dir(hidden_parent_dentry);
- /* did the mkdir suceed? */
+ /* did the mkdir succeed? */
if (err)
goto out;
@@ -131,8 +131,8 @@ out_nofix:
}
/*
- * Main rename code. This is sufficienly complex, that it's documented in
- * Docmentation/filesystems/unionfs/rename.txt. This routine calls
+ * Main rename code. This is sufficiently complex, that it's documented in
+ * Documentation/filesystems/unionfs/rename.txt. This routine calls
* __unionfs_rename() above to perform some of the work.
*/
static int do_unionfs_rename(struct inode *old_dir,
@@ -176,7 +176,7 @@ static int do_unionfs_rename(struct inode *old_dir,
}
}
- /* dont try to rename past new_dir's opaque branch */
+ /* don't try to rename past new_dir's opaque branch */
if (new_opaque != -1 && new_opaque < old_bend) {
old_bend = new_opaque;
whiteout = 1;
diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index cb0aad4..f84e1d8 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -103,7 +103,7 @@ struct odf_dentry_info {
/* odf sb data */
struct odf_sb_info {
- struct vfsmount *mnt; /* odf vmsmount */
+ struct vfsmount *mnt; /* odf vfsmount */
struct dentry *ns; /* namespace (/odf/ns) */
struct dentry *rc; /* reclaim (/odf/reclaim) */
struct dentry *ic; /* inode cache (/odf/ic) */
@@ -111,7 +111,7 @@ struct odf_sb_info {
struct dentry *sb; /* superblock file (/odf/sb) */
struct dentry *whiteout; /* file whiteouts are linked to */
struct sioa_args *cleanup; /* our cleanup thread */
- char *branch_uuids; /* not null terminated string of all branch uuids
*/
+ char *branch_uuids; /* not null terminated string of all branch UUIDs
*/
};
/* unionfs inode data in memory */
diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h
index f90d1c8..5bbdca4 100644
--- a/include/linux/fs_stack.h
+++ b/include/linux/fs_stack.h
@@ -40,4 +40,4 @@ static inline void fsstack_copy_attr_times(struct inode *dest,
dest->i_ctime = src->i_ctime;
}
-#endif /* _LINUX_FS_STACK_H */
+#endif /* not _LINUX_FS_STACK_H */
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
