Skip to content

L
linux
Commit db8d295b authored by Dave Kleikamp's avatar Dave Kleikamp
Browse files
Options

Merge jfs@jfs.bkbits.net:linux-2.5 

into austin.ibm.com:/shaggy/bk/jfs-2.5
parents 0672b0ba 06e15ce5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
fs/jfs/jfs_imap.c
View file @ db8d295b
...@@ -2055,7 +2055,7 @@ static int diAllocExt(struct inomap * imap, int agno, struct inode *ip) ...@@ -2055,7 +2055,7 @@ static int diAllocExt(struct inomap * imap, int agno, struct inode *ip)
static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino) static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino)
{ {
int extno, bitno, agno, sword, rc; int extno, bitno, agno, sword, rc;
struct metapage *amp, *bmp; struct metapage *amp = NULL, *bmp = NULL;
struct iag *aiagp = 0, *biagp = 0; struct iag *aiagp = 0, *biagp = 0;
u32 mask; u32 mask;
...@@ -2065,8 +2065,6 @@ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino) ...@@ -2065,8 +2065,6 @@ static int diAllocBit(struct inomap * imap, struct iag * iagp, int ino)
* it on the list. * it on the list.
*/ */
if (iagp->nfreeinos == cpu_to_le32(1)) { if (iagp->nfreeinos == cpu_to_le32(1)) {
amp = bmp = NULL;
if ((int) le32_to_cpu(iagp->inofreefwd) >= 0) { if ((int) le32_to_cpu(iagp->inofreefwd) >= 0) {
if ((rc = if ((rc =
diIAGRead(imap, le32_to_cpu(iagp->inofreefwd), diIAGRead(imap, le32_to_cpu(iagp->inofreefwd),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7