Whamcloud - gitweb
- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)
[fs/lustre-release.git] / lustre / kernel_patches / patches / extN-misc-fixup.patch
1 --- linux-2.4.17/fs/ext3/super.c.orig   Fri Dec 21 10:41:55 2001
2 +++ linux-2.4.17/fs/ext3/super.c        Fri Mar 22 11:00:41 2002
3 @@ -1344,10 +1342,10 @@
4                 printk(KERN_ERR "EXT3-fs: I/O error on journal device\n");
5                 goto out_journal;
6         }
7 -       if (ntohl(journal->j_superblock->s_nr_users) != 1) {
8 +       if (be32_to_cpu(journal->j_superblock->s_nr_users) != 1) {
9                 printk(KERN_ERR "EXT3-fs: External journal has more than one "
10                                         "user (unsupported) - %d\n",
11 -                       ntohl(journal->j_superblock->s_nr_users));
12 +                       be32_to_cpu(journal->j_superblock->s_nr_users));
13                 goto out_journal;
14         }
15         EXT3_SB(sb)->journal_bdev = bdev;
16 @@ -1560,6 +1560,7 @@
17         unlock_kernel();
18         return ret;
19  }
20 +EXPORT_SYMBOL(ext3_force_commit); /* here to avoid potential patch collisions */
21  
22  /*
23   * Ext3 always journals updates to the superblock itself, so we don't