lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
  jfs: clean up some compiler warnings
This commit is contained in:
Linus Torvalds
2011-07-27 09:26:39 -07:00
parent 333c066bb7 3c2c226285
commit 5fd00b0315
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/jfs/jfs_dmap.c
View File

@@ -3161,7 +3161,7 @@ static int dbAllocDmapBU(struct bmap * bmp, struct dmap * dp, s64 blkno,
{ {
int rc; int rc;
int dbitno, word, rembits, nb, nwords, wbitno, agno; int dbitno, word, rembits, nb, nwords, wbitno, agno;
s8 oldroot, *leaf; s8 oldroot;
struct dmaptree *tp = (struct dmaptree *) & dp->tree; struct dmaptree *tp = (struct dmaptree *) & dp->tree;
/* save the current value of the root (i.e. maximum free string) /* 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,
*/ */
oldroot = tp->stree[ROOT]; oldroot = tp->stree[ROOT];
/* pick up a pointer to the leaves of the dmap tree */
leaf = tp->stree + LEAFIND;
/* determine the bit number and word within the dmap of the /* determine the bit number and word within the dmap of the
* starting block. * starting block.
*/ */

6
fs/jfs/jfs_txnmgr.c
View File

@@ -1143,7 +1143,6 @@ int txCommit(tid_t tid, /* transaction identifier */
struct jfs_log *log; struct jfs_log *log;
struct tblock *tblk; struct tblock *tblk;
struct lrd *lrd; struct lrd *lrd;
int lsn;
struct inode *ip; struct inode *ip;
struct jfs_inode_info *jfs_ip; struct jfs_inode_info *jfs_ip;
int k, n; int k, n;
@@ -1310,7 +1309,7 @@ int txCommit(tid_t tid, /* transaction identifier */
*/ */
lrd->type = cpu_to_le16(LOG_COMMIT); lrd->type = cpu_to_le16(LOG_COMMIT);
lrd->length = 0; lrd->length = 0;
lsn = lmLog(log, tblk, lrd, NULL); lmLog(log, tblk, lrd, NULL);
lmGroupCommit(log, tblk); lmGroupCommit(log, tblk);
@@ -2935,7 +2934,6 @@ int jfs_sync(void *arg)
{ {
struct inode *ip; struct inode *ip;
struct jfs_inode_info *jfs_ip; struct jfs_inode_info *jfs_ip;
int rc;
tid_t tid; tid_t tid;
do { do {
@@ -2961,7 +2959,7 @@ int jfs_sync(void *arg)
*/ */
TXN_UNLOCK(); TXN_UNLOCK();
tid = txBegin(ip->i_sb, COMMIT_INODE); tid = txBegin(ip->i_sb, COMMIT_INODE);
rc = txCommit(tid, 1, &ip, 0); txCommit(tid, 1, &ip, 0);
txEnd(tid); txEnd(tid);
mutex_unlock(&jfs_ip->commit_mutex); mutex_unlock(&jfs_ip->commit_mutex);

3
fs/jfs/namei.c
View File

@@ -893,7 +893,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
unchar *i_fastsymlink; unchar *i_fastsymlink;
s64 xlen = 0; s64 xlen = 0;
int bmask = 0, xsize; int bmask = 0, xsize;
s64 extent = 0, xaddr; s64 xaddr;
struct metapage *mp; struct metapage *mp;
struct super_block *sb; struct super_block *sb;
struct tblock *tblk; struct tblock *tblk;
@@ -993,7 +993,6 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
txAbort(tid, 0); txAbort(tid, 0);
goto out3; goto out3;
} }
extent = xaddr;
ip->i_size = ssize - 1; ip->i_size = ssize - 1;
while (ssize) { while (ssize) {
/* This is kind of silly since PATH_MAX == 4K */ /* This is kind of silly since PATH_MAX == 4K */