aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Kleikamp <dave.kleikamp@oracle.com>2011-06-20 14:00:27 -0400
committerDave Kleikamp <dave.kleikamp@oracle.com>2011-07-25 12:01:12 -0400
commit3c2c22628599006047781946b317a16d9ff3883d (patch)
treee332dc2127efbfaad4a0a51b26b607113909b2aa
parentb6844e8f64920cdee620157252169ba63afb0c89 (diff)
jfs: clean up some compiler warnings
jfs has a few variables being set but never used. Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
-rw-r--r--fs/jfs/jfs_dmap.c5
-rw-r--r--fs/jfs/jfs_txnmgr.c6
-rw-r--r--fs/jfs/namei.c3
3 files changed, 4 insertions, 10 deletions
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index 4496872cf4e7..9cbd11a3f804 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -3161,7 +3161,7 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno,
3161{ 3161{
3162 int rc; 3162 int rc;
3163 int dbitno, word, rembits, nb, nwords, wbitno, agno; 3163 int dbitno, word, rembits, nb, nwords, wbitno, agno;
3164 s8 oldroot, *leaf; 3164 s8 oldroot;
3165 struct dmaptree *tp = (struct dmaptree *) & dp->tree; 3165 struct dmaptree *tp = (struct dmaptree *) & dp->tree;
3166 3166
3167 /* save the current value of the root (i.e. maximum free string) 3167 /* save the current value of the root (i.e. maximum free string)
@@ -3169,9 +3169,6 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno,
3169 */ 3169 */
3170 oldroot = tp->stree[ROOT]; 3170 oldroot = tp->stree[ROOT];
3171 3171
3172 /* pick up a pointer to the leaves of the dmap tree */
3173 leaf = tp->stree + LEAFIND;
3174
3175 /* determine the bit number and word within the dmap of the 3172 /* determine the bit number and word within the dmap of the
3176 * starting block. 3173 * starting block.
3177 */ 3174 */
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index f6cc0c09ec63..af9606057dde 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -1143,7 +1143,6 @@ int txCommit(tid_t tid, /* transaction identifier */
1143 struct jfs_log *log; 1143 struct jfs_log *log;
1144 struct tblock *tblk; 1144 struct tblock *tblk;
1145 struct lrd *lrd; 1145 struct lrd *lrd;
1146 int lsn;
1147 struct inode *ip; 1146 struct inode *ip;
1148 struct jfs_inode_info *jfs_ip; 1147 struct jfs_inode_info *jfs_ip;
1149 int k, n; 1148 int k, n;
@@ -1310,7 +1309,7 @@ int txCommit(tid_t tid, /* transaction identifier */
1310 */ 1309 */
1311 lrd->type = cpu_to_le16(LOG_COMMIT); 1310 lrd->type = cpu_to_le16(LOG_COMMIT);
1312 lrd->length = 0; 1311 lrd->length = 0;
1313 lsn = lmLog(log, tblk, lrd, NULL); 1312 lmLog(log, tblk, lrd, NULL);
1314 1313
1315 lmGroupCommit(log, tblk); 1314 lmGroupCommit(log, tblk);
1316 1315
@@ -2935,7 +2934,6 @@ int jfs_sync(void *arg)
2935{ 2934{
2936 struct inode *ip; 2935 struct inode *ip;
2937 struct jfs_inode_info *jfs_ip; 2936 struct jfs_inode_info *jfs_ip;
2938 int rc;
2939 tid_t tid; 2937 tid_t tid;
2940 2938
2941 do { 2939 do {
@@ -2961,7 +2959,7 @@ int jfs_sync(void *arg)
2961 */ 2959 */
2962 TXN_UNLOCK(); 2960 TXN_UNLOCK();
2963 tid = txBegin(ip->i_sb, COMMIT_INODE); 2961 tid = txBegin(ip->i_sb, COMMIT_INODE);
2964 rc = txCommit(tid, 1, &ip, 0); 2962 txCommit(tid, 1, &ip, 0);
2965 txEnd(tid); 2963 txEnd(tid);
2966 mutex_unlock(&jfs_ip->commit_mutex); 2964 mutex_unlock(&jfs_ip->commit_mutex);
2967 2965
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 03787ef6a118..45e5c6f65b2c 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -893,7 +893,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
893 unchar *i_fastsymlink; 893 unchar *i_fastsymlink;
894 s64 xlen = 0; 894 s64 xlen = 0;
895 int bmask = 0, xsize; 895 int bmask = 0, xsize;
896 s64 extent = 0, xaddr; 896 s64 xaddr;
897 struct metapage *mp; 897 struct metapage *mp;
898 struct super_block *sb; 898 struct super_block *sb;
899 struct tblock *tblk; 899 struct tblock *tblk;
@@ -993,7 +993,6 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
993 txAbort(tid, 0); 993 txAbort(tid, 0);
994 goto out3; 994 goto out3;
995 } 995 }
996 extent = xaddr;
997 ip->i_size = ssize - 1; 996 ip->i_size = ssize - 1;
998 while (ssize) { 997 while (ssize) {
999 /* This is kind of silly since PATH_MAX == 4K */ 998 /* This is kind of silly since PATH_MAX == 4K */