[Cluster-devel] [PATCH] gfs2: Fix use of English

[Alan Cox <alan@lxorguk.ukuu.org.uk>]

According to the OED and also confirmed by the British Computer Society
folks the correct verb form is "to journali[sz]e". The US favours the "s"
form and the BCS likewise. Bring GFS2 into line with English.

Documentation changes only

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/gfs2/bmap.c linux-2.6.25-mm1/fs/gfs2/bmap.c
--- linux.vanilla-2.6.25-mm1/fs/gfs2/bmap.c	2008-04-28 11:36:50.000000000 +0100
+++ linux-2.6.25-mm1/fs/gfs2/bmap.c	2008-05-02 12:36:20.000000000 +0100
@@ -1025,11 +1025,11 @@
 {
 	struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
 	struct buffer_head *dibh;
-	int journaled = gfs2_is_jdata(ip);
+	int journalised = gfs2_is_jdata(ip);
 	int error;
 
 	error = gfs2_trans_begin(sdp,
-				 RES_DINODE + (journaled ? RES_JDATA : 0), 0);
+			 RES_DINODE + (journalised ? RES_JDATA : 0), 0);
 	if (error)
 		return error;
 
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/gfs2/incore.h linux-2.6.25-mm1/fs/gfs2/incore.h
--- linux.vanilla-2.6.25-mm1/fs/gfs2/incore.h	2008-04-28 11:36:50.000000000 +0100
+++ linux-2.6.25-mm1/fs/gfs2/incore.h	2008-05-02 13:53:20.000000000 +0100
@@ -478,7 +478,7 @@
 	u32 sd_fsb2bb_shift;
 	u32 sd_diptrs;	/* Number of pointers in a dinode */
 	u32 sd_inptrs;	/* Number of pointers in a indirect block */
-	u32 sd_jbsize;	/* Size of a journaled data block */
+	u32 sd_jbsize;	/* Size of a journalised data block */
 	u32 sd_hash_bsize;	/* sizeof(exhash block) */
 	u32 sd_hash_bsize_shift;
 	u32 sd_hash_ptrs;	/* Number of pointers in a hash block */
@@ -486,7 +486,7 @@
 	u32 sd_max_dirres;	/* Max blocks needed to add a directory entry */
 	u32 sd_max_height;	/* Max height of a file's metadata tree */
 	u64 sd_heightsize[GFS2_MAX_META_HEIGHT + 1];
-	u32 sd_max_jheight; /* Max height of journaled file's meta tree */
+	u32 sd_max_jheight; /* Max height of journalised file's meta tree */
 	u64 sd_jheightsize[GFS2_MAX_META_HEIGHT + 1];
 
 	struct gfs2_args sd_args;	/* Mount arguments */
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/gfs2/log.c linux-2.6.25-mm1/fs/gfs2/log.c
--- linux.vanilla-2.6.25-mm1/fs/gfs2/log.c	2008-04-28 11:36:50.000000000 +0100
+++ linux-2.6.25-mm1/fs/gfs2/log.c	2008-05-02 12:36:46.000000000 +0100
@@ -380,7 +380,7 @@
  *
  * This is complex.  We need to reserve room for all our currently used
  * metadata buffers (e.g. normal file I/O rewriting file time stamps) and 
- * all our journaled data buffers for journaled files (e.g. files in the 
+ * all our journalised data buffers for journalised files (e.g. files in the 
  * meta_fs like rindex, or files for which chattr +j was done.)
  * If we don't reserve enough space, gfs2_log_refund and gfs2_log_flush
  * will count it as free space (sd_log_blks_free) and corruption will follow.
@@ -389,9 +389,9 @@
  * type gets its own log header, for which we need to reserve a block.
  * In fact, each type has the potential for needing more than one header 
  * in cases where we have more buffers than will fit on a journal page.
- * Metadata journal entries take up half the space of journaled buffer entries.
- * Thus, metadata entries have buf_limit (502) and journaled buffers have
- * databuf_limit (251) before they cause a wrap around.
+ * Metadata journal entries take up half the space of journalised buffer
+ * entries. Thus, metadata entries have buf_limit (502) and journalised
+ * buffers have databuf_limit (251) before they cause a wrap around.
  *
  * Also, we need to reserve blocks for revoke journal entries and one for an
  * overall header for the lot.
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/gfs2/lops.c linux-2.6.25-mm1/fs/gfs2/lops.c
--- linux.vanilla-2.6.25-mm1/fs/gfs2/lops.c	2008-04-28 11:36:50.000000000 +0100
+++ linux-2.6.25-mm1/fs/gfs2/lops.c	2008-05-02 12:37:08.000000000 +0100
@@ -484,7 +484,7 @@
  * i) In ordered write mode
  *    We put the data buffer on a list so that we can ensure that its
  *    synced to disk at the right time
- * ii) In journaled data mode
+ * ii) In journalised data mode
  *    We need to journal the data block in the same way as metadata in
  *    the functions above. The difference is that here we have a tag
  *    which is two __be64's being the block number (as per meta data)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-mm1/fs/gfs2/ops_file.c linux-2.6.25-mm1/fs/gfs2/ops_file.c
--- linux.vanilla-2.6.25-mm1/fs/gfs2/ops_file.c	2008-04-28 11:36:50.000000000 +0100
+++ linux-2.6.25-mm1/fs/gfs2/ops_file.c	2008-05-02 12:37:33.000000000 +0100
@@ -535,7 +535,7 @@
  * @dentry: the dentry that points to the inode to sync
  *
  * The VFS will flush "normal" data for us. We only need to worry
- * about metadata here. For journaled data, we just do a log flush
+ * about metadata here. For journalised data, we just do a log flush
  * as we can't avoid it. Otherwise we can just bale out if datasync
  * is set. For stuffed inodes we must flush the log in order to
  * ensure that all data is on disk.