[PATCH] misc fixes

- Revert the 3c59x.c compile warning fixes.  The return type of inl()
  was reverted back to the correct 32 bits.

- Fix an uninitialised timer in ext3 (JBD debug mode only) - run
  setup_ro_after() during initialisation.

- Fix ifdef/endif imbalance in JFS

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 974cf6e876b7893ad7a667ff0395131022fa7f82..8f83122279101bf668a2c37b5eccd1c3860f5a1e 100644 (file)
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1804,10 +1804,10 @@ static void vortex_tx_timeout(struct net_device *dev)
                   inw(ioaddr + EL3_STATUS));
        EL3WINDOW(4);
        printk(KERN_ERR "  diagnostics: net %04x media %04x dma %08x fifo %04x\n",
-                       (unsigned)inw(ioaddr + Wn4_NetDiag),
-                       (unsigned)inw(ioaddr + Wn4_Media),
-                       (unsigned)inl(ioaddr + PktStatus),
-                       (unsigned)inw(ioaddr + Wn4_FIFODiag));
+                       inw(ioaddr + Wn4_NetDiag),
+                       inw(ioaddr + Wn4_Media),
+                       inl(ioaddr + PktStatus),
+                       inw(ioaddr + Wn4_FIFODiag));
        /* Slight code bloat to be user friendly. */
        if ((inb(ioaddr + TxStatus) & 0x88) == 0x88)
                printk(KERN_ERR "%s: Transmitter encountered 16 collisions --"
@@ -2644,7 +2644,7 @@ dump_tx_ring(struct net_device *dev)
                                        vp->dirty_tx, vp->dirty_tx % TX_RING_SIZE,
                                        vp->cur_tx, vp->cur_tx % TX_RING_SIZE);
                        printk(KERN_ERR "  Transmit list %8.8x vs. %p.\n",
-                                  (unsigned)inl(ioaddr + DownListPtr),
+                                  inl(ioaddr + DownListPtr),
                                   &vp->tx_ring[vp->dirty_tx % TX_RING_SIZE]);
                        issue_and_wait(dev, DownStall);
                        for (i = 0; i < TX_RING_SIZE; i++) {

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 424f807dadb5f00e82e5c2b6cbbe03841235f5ab..c081e426fd1f6e84cd173849bd3e8ba83733e4b2 100644 (file)
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1021,6 +1021,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
        sbi->s_mount_opt = 0;
        sbi->s_resuid = EXT3_DEF_RESUID;
        sbi->s_resgid = EXT3_DEF_RESGID;
+       setup_ro_after(sb);
 
        blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);
        if (!blocksize) {

diff --git a/fs/jfs/jfs_acl.h b/fs/jfs/jfs_acl.h
index 3a246ef01778de9ad79c84f818597f60bc2f9bbe..179a3893a9456b56d1aae2ceba277377c13e738d 100644 (file)
--- a/fs/jfs/jfs_acl.h
+++ b/fs/jfs/jfs_acl.h
@@ -29,4 +29,5 @@ int jfs_permission(struct inode *, int);
 int jfs_init_acl(struct inode *, struct inode *);
 int jfs_setattr(struct dentry *, struct iattr *);
 
-#endif                         /* CONFIG_JFS_POSIX_ACL */
+#endif         /* CONFIG_JFS_POSIX_ACL */
+#endif         /* _H_JFS_ACL */