diff options
-rw-r--r-- | fs/qnx4/inode.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 2bfd987f4853..63e0f7471fb5 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c | |||
@@ -194,20 +194,18 @@ static const char *qnx4_checkroot(struct super_block *sb) | |||
194 | } | 194 | } |
195 | for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) { | 195 | for (i = 0; i < QNX4_INODES_PER_BLOCK; i++) { |
196 | rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE); | 196 | rootdir = (struct qnx4_inode_entry *) (bh->b_data + i * QNX4_DIR_ENTRY_SIZE); |
197 | if (rootdir->di_fname != NULL) { | 197 | QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname)); |
198 | QNX4DEBUG((KERN_INFO "rootdir entry found : [%s]\n", rootdir->di_fname)); | 198 | if (!strcmp(rootdir->di_fname, |
199 | if (!strcmp(rootdir->di_fname, | 199 | QNX4_BMNAME)) { |
200 | QNX4_BMNAME)) { | 200 | found = 1; |
201 | found = 1; | 201 | qnx4_sb(sb)->BitMap = kmemdup(rootdir, |
202 | qnx4_sb(sb)->BitMap = kmemdup(rootdir, | 202 | sizeof(struct qnx4_inode_entry), |
203 | sizeof(struct qnx4_inode_entry), | 203 | GFP_KERNEL); |
204 | GFP_KERNEL); | 204 | if (!qnx4_sb(sb)->BitMap) { |
205 | if (!qnx4_sb(sb)->BitMap) { | 205 | brelse (bh); |
206 | brelse (bh); | 206 | return "not enough memory for bitmap inode"; |
207 | return "not enough memory for bitmap inode"; | 207 | }/* keep bitmap inode known */ |
208 | }/* keep bitmap inode known */ | 208 | break; |
209 | break; | ||
210 | } | ||
211 | } | 209 | } |
212 | } | 210 | } |
213 | brelse(bh); | 211 | brelse(bh); |