Merge b_md into HEAD

[fs/lustre-release.git] / lustre / extN / extN-misc-fixup.diff

diff --git a/lustre/extN/extN-misc-fixup.diff b/lustre/extN/extN-misc-fixup.diff
index 29b36fb..db0bc0f 100644 (file)
--- a/lustre/extN/extN-misc-fixup.diff
+++ b/lustre/extN/extN-misc-fixup.diff
@@ -13,3 +13,11 @@
                goto out_journal;
        }
        EXTN_SB(sb)->journal_bdev = bdev;
+@@ -1560,6 +1560,7 @@
+       unlock_kernel();
+       return ret;
+ }
++EXPORT_SYMBOL(extN_force_commit); /* here to avoid potential patch collisions */
+ 
+ /*
+  * Ext3 always journals updates to the superblock itself, so we don't