[Ocfs2-commits] mfasheh commits r1440 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-09-08 20:45:20 -0500 (Wed, 08 Sep 2004)
New Revision: 1440

Modified:
   trunk/src/journal.c
   trunk/src/ocfs_journal.h
Log:
* remove unused lockid member from journal struct.



Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-09-09 01:14:40 UTC (rev 1439)
+++ trunk/src/journal.c	2004-09-09 01:45:20 UTC (rev 1440)
@@ -1073,7 +1073,6 @@
 	struct inode *inode = NULL; /* the journal inode */
 	journal_t * k_journal = NULL;
 	ocfs2_dinode *fe = NULL;
-	__u64 lock_id = 0;
 	struct buffer_head *bh = NULL;
 
 	LOG_ENTRY();
@@ -1097,7 +1096,6 @@
 		status = -EACCES;
 		goto done;
 	}
-	lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
 
 	down_write(&OCFS_I(inode)->ip_io_sem);
 
@@ -1165,7 +1163,6 @@
 	osb->journal->k_inode = inode;
 	osb->journal->version = OCFS_JOURNAL_CURRENT_VERSION;
 	osb->journal->lockbh = bh;
-	osb->journal->lock_id = lock_id;
 	atomic_set(&(osb->journal->num_trans), 0);
 	atomic_set(&(osb->journal->num_cmt_locks), 0);
 	atomic_set(&(osb->journal->num_chkpt_locks), 0);
@@ -1485,7 +1482,6 @@
 {
 	int status = -1;
 	int tmpstat;
-	__u64 lock_id = 0;
 	ocfs2_dinode *fe;
 	struct inode *inode = NULL;
 	journal_t *k_journal = NULL;
@@ -1528,7 +1524,6 @@
 		status = -EACCES;
 		goto done;
 	}
-	lock_id = OCFS_I(inode)->ip_blkno << inode->i_sb->s_blocksize_bits;
 
 	down_write(&OCFS_I(inode)->ip_io_sem);
 

Modified: trunk/src/ocfs_journal.h
===================================================================
--- trunk/src/ocfs_journal.h	2004-09-09 01:14:40 UTC (rev 1439)
+++ trunk/src/ocfs_journal.h	2004-09-09 01:45:20 UTC (rev 1440)
@@ -54,7 +54,6 @@
 	struct inode              *k_inode;   /* Kernel inode pointing to
 					       * this journal             */
 	__u8                      version;    /* Journal version          */
-	__u64                     lock_id;    /* Lock id for journal file */ 
 	struct _ocfs_super        *osb;       /* pointer to the super
 					       * block for the node
 					       * we're currently