Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] ufs: alloc metadata null page fix

Browse Source 
These series of patches result of UFS1 write support stress testing, like
running fsx-linux, untar and build linux kernel etc

We pass from ufs::get_block_t to levels below: pointer to the current page, to
make possible things like reallocation of blocks on the fly, and we also uses
this pointer for indication, what actually we allocate data block or meta data
block, but currently we make decision about what we allocate on the wrong
level, this may and cause oops if we allocate blocks in some special order.

Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Evgeniy Dushistov 2007-01-29 13:19:54 -08:00 committed by Linus Torvalds
parent ff79544754
commit a685e26fff
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ufs/balloc.c
View File

@ -233,7 +233,7 @@ static void ufs_change_blocknr(struct inode *inode, unsigned int baseblk,
{ {
unsigned int blk_per_page = 1 << (PAGE_CACHE_SHIFT - inode->i_blkbits); unsigned int blk_per_page = 1 << (PAGE_CACHE_SHIFT - inode->i_blkbits);
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
pgoff_t index, cur_index = locked_page->index; pgoff_t index, cur_index;
unsigned int i, j; unsigned int i, j;
struct page *page; struct page *page;
struct buffer_head *head, *bh; struct buffer_head *head, *bh;
@ -241,8 +241,11 @@ static void ufs_change_blocknr(struct inode *inode, unsigned int baseblk,
UFSD("ENTER, ino %lu, count %u, oldb %u, newb %u\n", UFSD("ENTER, ino %lu, count %u, oldb %u, newb %u\n",
inode->i_ino, count, oldb, newb); inode->i_ino, count, oldb, newb);
BUG_ON(!locked_page);
BUG_ON(!PageLocked(locked_page)); BUG_ON(!PageLocked(locked_page));
cur_index = locked_page->index;
for (i = 0; i < count; i += blk_per_page) { for (i = 0; i < count; i += blk_per_page) {
index = (baseblk+i) >> (PAGE_CACHE_SHIFT - inode->i_blkbits); index = (baseblk+i) >> (PAGE_CACHE_SHIFT - inode->i_blkbits);

14
fs/ufs/inode.c
View File

@ -242,7 +242,8 @@ repeat:
goal = tmp + uspi->s_fpb; goal = tmp + uspi->s_fpb;
tmp = ufs_new_fragments (inode, p, fragment - blockoff, tmp = ufs_new_fragments (inode, p, fragment - blockoff,
goal, required + blockoff, goal, required + blockoff,
err, locked_page); err,
phys != NULL ? locked_page : NULL);
} }
/* /*
* We will extend last allocated block * We will extend last allocated block
@ -250,7 +251,7 @@ repeat:
else if (lastblock == block) { else if (lastblock == block) {
tmp = ufs_new_fragments(inode, p, fragment - (blockoff - lastblockoff), tmp = ufs_new_fragments(inode, p, fragment - (blockoff - lastblockoff),
fs32_to_cpu(sb, *p), required + (blockoff - lastblockoff), fs32_to_cpu(sb, *p), required + (blockoff - lastblockoff),
err, locked_page); err, phys != NULL ? locked_page : NULL);
} else /* (lastblock > block) */ { } else /* (lastblock > block) */ {
/* /*
* We will allocate new block before last allocated block * We will allocate new block before last allocated block
@ -261,7 +262,8 @@ repeat:
goal = tmp + uspi->s_fpb; goal = tmp + uspi->s_fpb;
} }
tmp = ufs_new_fragments(inode, p, fragment - blockoff, tmp = ufs_new_fragments(inode, p, fragment - blockoff,
goal, uspi->s_fpb, err, locked_page); goal, uspi->s_fpb, err,
phys != NULL ? locked_page : NULL);
} }
if (!tmp) { if (!tmp) {
if ((!blockoff && *p) || if ((!blockoff && *p) ||
@ -438,9 +440,11 @@ int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buffer_head
* it much more readable: * it much more readable:
*/ */
#define GET_INODE_DATABLOCK(x) \ #define GET_INODE_DATABLOCK(x) \
ufs_inode_getfrag(inode, x, fragment, 1, &err, &phys, &new, bh_result->b_page) ufs_inode_getfrag(inode, x, fragment, 1, &err, &phys, &new,\
bh_result->b_page)
#define GET_INODE_PTR(x) \ #define GET_INODE_PTR(x) \
ufs_inode_getfrag(inode, x, fragment, uspi->s_fpb, &err, NULL, NULL, NULL) ufs_inode_getfrag(inode, x, fragment, uspi->s_fpb, &err, NULL, NULL,\
bh_result->b_page)
#define GET_INDIRECT_DATABLOCK(x) \ #define GET_INDIRECT_DATABLOCK(x) \
ufs_inode_getblock(inode, bh, x, fragment, \ ufs_inode_getblock(inode, bh, x, fragment, \
&err, &phys, &new, bh_result->b_page) &err, &phys, &new, bh_result->b_page)