ocfs2: Fill node number during cluster stack init

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / super.c

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 8f536b39ce5b2d34de31b6af9d4e69a3a8301513..fa9c46e2eab8888d0e6640876d24f224a29aedd7 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -108,7 +108,6 @@ static int ocfs2_sync_fs(struct super_block *sb, int wait);
 static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb);
 static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb);
 static void ocfs2_release_system_inodes(struct ocfs2_super *osb);
-static int ocfs2_fill_local_node_info(struct ocfs2_super *osb);
 static int ocfs2_check_volume(struct ocfs2_super *osb);
 static int ocfs2_verify_volume(struct ocfs2_dinode *di,
                               struct buffer_head *bh,
@@ -1126,32 +1125,6 @@ static int ocfs2_get_sector(struct super_block *sb,
        return 0;
 }
 
-/* ocfs2 1.0 only allows one cluster and node identity per kernel image. */
-static int ocfs2_fill_local_node_info(struct ocfs2_super *osb)
-{
-       int status;
-
-       /* XXX hold a ref on the node while mounte?  easy enough, if
-        * desirable. */
-       if (ocfs2_mount_local(osb))
-               osb->node_num = 0;
-       else {
-               status = ocfs2_cluster_this_node(&osb->node_num);
-               if (status < 0) {
-                       mlog_errno(status);
-                       mlog(ML_ERROR,
-                            "could not find this host's node number\n");
-                       goto bail;
-               }
-       }
-
-       mlog(0, "I am node %u\n", osb->node_num);
-
-       status = 0;
-bail:
-       return status;
-}
-
 static int ocfs2_mount_volume(struct super_block *sb)
 {
        int status = 0;
@@ -1163,12 +1136,6 @@ static int ocfs2_mount_volume(struct super_block *sb)
        if (ocfs2_is_hard_readonly(osb))
                goto leave;
 
-       status = ocfs2_fill_local_node_info(osb);
-       if (status < 0) {
-               mlog_errno(status);
-               goto leave;
-       }
-
        status = ocfs2_dlm_init(osb);
        if (status < 0) {
                mlog_errno(status);