mtd/fs/jffs2 scan.c,1.99,1.100 dir.c,1.76,1.77

[David Woodhouse]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv21688

Modified Files:
	scan.c dir.c 
Log Message:
s/(\([a-z]*\)+3)&~3/PAD(\1)/ as suggested by matsunaga_kazuhisa at yahoo.co.jp


Index: scan.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/scan.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- scan.c	28 Apr 2003 10:17:17 -0000	1.99
+++ scan.c	5 Jun 2003 14:42:24 -0000	1.100
@@ -354,7 +354,7 @@
 
 		if (ofs & 3) {
 			printk(KERN_WARNING "Eep. ofs 0x%08x not word-aligned!\n", ofs);
-			ofs = (ofs+3)&~3;
+			ofs = PAD(ofs);
 			continue;
 		}
 		if (ofs == prevofs) {

Index: dir.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/dir.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- dir.c	26 May 2003 09:50:38 -0000	1.76
+++ dir.c	5 Jun 2003 14:42:24 -0000	1.77
@@ -356,7 +356,7 @@
 	up(&f->sem);
 
 	/* Work out where to put the dirent node now. */
-	writtenlen = (writtenlen+3)&~3;
+	writtenlen = PAD(writtenlen);
 	phys_ofs += writtenlen;
 	alloclen -= writtenlen;
 
@@ -653,7 +653,7 @@
 	up(&f->sem);
 
 	/* Work out where to put the dirent node now. */
-	writtenlen = (writtenlen+3)&~3;
+	writtenlen = PAD(writtenlen);
 	phys_ofs += writtenlen;
 	alloclen -= writtenlen;