Commit 54fb996a authored by Evgeniy Dushistov's avatar Evgeniy Dushistov Committed by Linus Torvalds

[PATCH] ufs2 write: block allocation update

Patch adds ability to work with 64bit metadata, this made by replacing work
with 32bit pointers by inline functions.
Signed-off-by: default avatarEvgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3313e292
This diff is collapsed.
...@@ -170,7 +170,7 @@ static u64 ufs_frag_map(struct inode *inode, sector_t frag) ...@@ -170,7 +170,7 @@ static u64 ufs_frag_map(struct inode *inode, sector_t frag)
* @locked_page - for ufs_new_fragments() * @locked_page - for ufs_new_fragments()
*/ */
static struct buffer_head * static struct buffer_head *
ufs_inode_getfrag(struct inode *inode, unsigned int fragment, ufs_inode_getfrag(struct inode *inode, u64 fragment,
sector_t new_fragment, unsigned int required, int *err, sector_t new_fragment, unsigned int required, int *err,
long *phys, int *new, struct page *locked_page) long *phys, int *new, struct page *locked_page)
{ {
...@@ -178,12 +178,12 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment, ...@@ -178,12 +178,12 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
struct buffer_head * result; struct buffer_head * result;
unsigned block, blockoff, lastfrag, lastblock, lastblockoff; unsigned blockoff, lastblockoff;
unsigned tmp, goal; u64 tmp, goal, lastfrag, block, lastblock;
__fs32 * p, * p2; void *p, *p2;
UFSD("ENTER, ino %lu, fragment %u, new_fragment %llu, required %u, " UFSD("ENTER, ino %lu, fragment %llu, new_fragment %llu, required %u, "
"metadata %d\n", inode->i_ino, fragment, "metadata %d\n", inode->i_ino, (unsigned long long)fragment,
(unsigned long long)new_fragment, required, !phys); (unsigned long long)new_fragment, required, !phys);
/* TODO : to be done for write support /* TODO : to be done for write support
...@@ -193,17 +193,20 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment, ...@@ -193,17 +193,20 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
block = ufs_fragstoblks (fragment); block = ufs_fragstoblks (fragment);
blockoff = ufs_fragnum (fragment); blockoff = ufs_fragnum (fragment);
p = ufsi->i_u1.i_data + block; p = ufs_get_direct_data_ptr(uspi, ufsi, block);
goal = 0; goal = 0;
repeat: repeat:
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
lastfrag = ufsi->i_lastfrag; lastfrag = ufsi->i_lastfrag;
if (tmp && fragment < lastfrag) { if (tmp && fragment < lastfrag) {
if (!phys) { if (!phys) {
result = sb_getblk(sb, uspi->s_sbbase + tmp + blockoff); result = sb_getblk(sb, uspi->s_sbbase + tmp + blockoff);
if (tmp == fs32_to_cpu(sb, *p)) { if (tmp == ufs_data_ptr_to_cpu(sb, p)) {
UFSD("EXIT, result %u\n", tmp + blockoff); UFSD("EXIT, result %llu\n",
(unsigned long long)tmp + blockoff);
return result; return result;
} }
brelse (result); brelse (result);
...@@ -224,9 +227,10 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment, ...@@ -224,9 +227,10 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
* We must reallocate last allocated block * We must reallocate last allocated block
*/ */
if (lastblockoff) { if (lastblockoff) {
p2 = ufsi->i_u1.i_data + lastblock; p2 = ufs_get_direct_data_ptr(uspi, ufsi, lastblock);
tmp = ufs_new_fragments (inode, p2, lastfrag, tmp = ufs_new_fragments(inode, p2, lastfrag,
fs32_to_cpu(sb, *p2), uspi->s_fpb - lastblockoff, ufs_data_ptr_to_cpu(sb, p2),
uspi->s_fpb - lastblockoff,
err, locked_page); err, locked_page);
if (!tmp) { if (!tmp) {
if (lastfrag != ufsi->i_lastfrag) if (lastfrag != ufsi->i_lastfrag)
...@@ -237,27 +241,31 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment, ...@@ -237,27 +241,31 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
lastfrag = ufsi->i_lastfrag; lastfrag = ufsi->i_lastfrag;
} }
tmp = fs32_to_cpu(sb, ufsi->i_u1.i_data[lastblock]); tmp = ufs_data_ptr_to_cpu(sb,
ufs_get_direct_data_ptr(uspi, ufsi,
lastblock));
if (tmp) if (tmp)
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, err,
phys != NULL ? locked_page : NULL); phys != NULL ? locked_page : NULL);
} } else if (lastblock == block) {
/* /*
* We will extend last allocated block * We will extend last allocated block
*/ */
else if (lastblock == block) { tmp = ufs_new_fragments(inode, p, fragment -
tmp = ufs_new_fragments(inode, p, fragment - (blockoff - lastblockoff), (blockoff - lastblockoff),
fs32_to_cpu(sb, *p), required + (blockoff - lastblockoff), ufs_data_ptr_to_cpu(sb, p),
required + (blockoff - lastblockoff),
err, phys != NULL ? locked_page : NULL); 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
*/ */
if (block) { if (block) {
tmp = fs32_to_cpu(sb, ufsi->i_u1.i_data[block-1]); tmp = ufs_data_ptr_to_cpu(sb,
ufs_get_direct_data_ptr(uspi, ufsi, block - 1));
if (tmp) if (tmp)
goal = tmp + uspi->s_fpb; goal = tmp + uspi->s_fpb;
} }
...@@ -266,7 +274,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment, ...@@ -266,7 +274,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
phys != NULL ? locked_page : NULL); phys != NULL ? locked_page : NULL);
} }
if (!tmp) { if (!tmp) {
if ((!blockoff && *p) || if ((!blockoff && ufs_data_ptr_to_cpu(sb, p)) ||
(blockoff && lastfrag != ufsi->i_lastfrag)) (blockoff && lastfrag != ufsi->i_lastfrag))
goto repeat; goto repeat;
*err = -ENOSPC; *err = -ENOSPC;
...@@ -286,7 +294,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment, ...@@ -286,7 +294,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
if (IS_SYNC(inode)) if (IS_SYNC(inode))
ufs_sync_inode (inode); ufs_sync_inode (inode);
mark_inode_dirty(inode); mark_inode_dirty(inode);
UFSD("EXIT, result %u\n", tmp + blockoff); UFSD("EXIT, result %llu\n", (unsigned long long)tmp + blockoff);
return result; return result;
/* This part : To be implemented .... /* This part : To be implemented ....
...@@ -320,20 +328,22 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment, ...@@ -320,20 +328,22 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
*/ */
static struct buffer_head * static struct buffer_head *
ufs_inode_getblock(struct inode *inode, struct buffer_head *bh, ufs_inode_getblock(struct inode *inode, struct buffer_head *bh,
unsigned int fragment, sector_t new_fragment, int *err, u64 fragment, sector_t new_fragment, int *err,
long *phys, int *new, struct page *locked_page) long *phys, int *new, struct page *locked_page)
{ {
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
struct buffer_head * result; struct buffer_head * result;
unsigned tmp, goal, block, blockoff; unsigned blockoff;
__fs32 * p; u64 tmp, goal, block;
void *p;
block = ufs_fragstoblks (fragment); block = ufs_fragstoblks (fragment);
blockoff = ufs_fragnum (fragment); blockoff = ufs_fragnum (fragment);
UFSD("ENTER, ino %lu, fragment %u, new_fragment %llu, metadata %d\n", UFSD("ENTER, ino %lu, fragment %llu, new_fragment %llu, metadata %d\n",
inode->i_ino, fragment, (unsigned long long)new_fragment, !phys); inode->i_ino, (unsigned long long)fragment,
(unsigned long long)new_fragment, !phys);
result = NULL; result = NULL;
if (!bh) if (!bh)
...@@ -344,14 +354,16 @@ ufs_inode_getblock(struct inode *inode, struct buffer_head *bh, ...@@ -344,14 +354,16 @@ ufs_inode_getblock(struct inode *inode, struct buffer_head *bh,
if (!buffer_uptodate(bh)) if (!buffer_uptodate(bh))
goto out; goto out;
} }
if (uspi->fs_magic == UFS2_MAGIC)
p = (__fs32 *) bh->b_data + block; p = (__fs64 *)bh->b_data + block;
else
p = (__fs32 *)bh->b_data + block;
repeat: repeat:
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
if (tmp) { if (tmp) {
if (!phys) { if (!phys) {
result = sb_getblk(sb, uspi->s_sbbase + tmp + blockoff); result = sb_getblk(sb, uspi->s_sbbase + tmp + blockoff);
if (tmp == fs32_to_cpu(sb, *p)) if (tmp == ufs_data_ptr_to_cpu(sb, p))
goto out; goto out;
brelse (result); brelse (result);
goto repeat; goto repeat;
...@@ -361,14 +373,16 @@ ufs_inode_getblock(struct inode *inode, struct buffer_head *bh, ...@@ -361,14 +373,16 @@ ufs_inode_getblock(struct inode *inode, struct buffer_head *bh,
} }
} }
if (block && (tmp = fs32_to_cpu(sb, ((__fs32*)bh->b_data)[block-1]))) if (block && (uspi->fs_magic == UFS2_MAGIC ?
(tmp = fs64_to_cpu(sb, ((__fs64 *)bh->b_data)[block-1])) :
(tmp = fs32_to_cpu(sb, ((__fs32 *)bh->b_data)[block-1]))))
goal = tmp + uspi->s_fpb; goal = tmp + uspi->s_fpb;
else else
goal = bh->b_blocknr + uspi->s_fpb; goal = bh->b_blocknr + uspi->s_fpb;
tmp = ufs_new_fragments(inode, p, ufs_blknum(new_fragment), goal, tmp = ufs_new_fragments(inode, p, ufs_blknum(new_fragment), goal,
uspi->s_fpb, err, locked_page); uspi->s_fpb, err, locked_page);
if (!tmp) { if (!tmp) {
if (fs32_to_cpu(sb, *p)) if (ufs_data_ptr_to_cpu(sb, p))
goto repeat; goto repeat;
goto out; goto out;
} }
...@@ -386,7 +400,7 @@ ufs_inode_getblock(struct inode *inode, struct buffer_head *bh, ...@@ -386,7 +400,7 @@ ufs_inode_getblock(struct inode *inode, struct buffer_head *bh,
sync_dirty_buffer(bh); sync_dirty_buffer(bh);
inode->i_ctime = CURRENT_TIME_SEC; inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode); mark_inode_dirty(inode);
UFSD("result %u\n", tmp + blockoff); UFSD("result %llu\n", (unsigned long long)tmp + blockoff);
out: out:
brelse (bh); brelse (bh);
UFSD("EXIT\n"); UFSD("EXIT\n");
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
*/ */
/* /*
* Modified to avoid infinite loop on 2006 by * Adoptation to use page cache and UFS2 write support by
* Evgeniy Dushistov <dushistov@mail.ru> * Evgeniy Dushistov <dushistov@mail.ru>, 2006-2007
*/ */
#include <linux/errno.h> #include <linux/errno.h>
...@@ -63,13 +63,13 @@ ...@@ -63,13 +63,13 @@
#define DIRECT_FRAGMENT ((inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift) #define DIRECT_FRAGMENT ((inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift)
static int ufs_trunc_direct (struct inode * inode) static int ufs_trunc_direct(struct inode *inode)
{ {
struct ufs_inode_info *ufsi = UFS_I(inode); struct ufs_inode_info *ufsi = UFS_I(inode);
struct super_block * sb; struct super_block * sb;
struct ufs_sb_private_info * uspi; struct ufs_sb_private_info * uspi;
__fs32 * p; void *p;
unsigned frag1, frag2, frag3, frag4, block1, block2; u64 frag1, frag2, frag3, frag4, block1, block2;
unsigned frag_to_free, free_count; unsigned frag_to_free, free_count;
unsigned i, tmp; unsigned i, tmp;
int retry; int retry;
...@@ -91,13 +91,16 @@ static int ufs_trunc_direct (struct inode * inode) ...@@ -91,13 +91,16 @@ static int ufs_trunc_direct (struct inode * inode)
if (frag2 > frag3) { if (frag2 > frag3) {
frag2 = frag4; frag2 = frag4;
frag3 = frag4 = 0; frag3 = frag4 = 0;
} } else if (frag2 < frag3) {
else if (frag2 < frag3) {
block1 = ufs_fragstoblks (frag2); block1 = ufs_fragstoblks (frag2);
block2 = ufs_fragstoblks (frag3); block2 = ufs_fragstoblks (frag3);
} }
UFSD("frag1 %u, frag2 %u, block1 %u, block2 %u, frag3 %u, frag4 %u\n", frag1, frag2, block1, block2, frag3, frag4); UFSD("frag1 %llu, frag2 %llu, block1 %llu, block2 %llu, frag3 %llu,"
" frag4 %llu\n",
(unsigned long long)frag1, (unsigned long long)frag2,
(unsigned long long)block1, (unsigned long long)block2,
(unsigned long long)frag3, (unsigned long long)frag4);
if (frag1 >= frag2) if (frag1 >= frag2)
goto next1; goto next1;
...@@ -105,8 +108,8 @@ static int ufs_trunc_direct (struct inode * inode) ...@@ -105,8 +108,8 @@ static int ufs_trunc_direct (struct inode * inode)
/* /*
* Free first free fragments * Free first free fragments
*/ */
p = ufsi->i_u1.i_data + ufs_fragstoblks (frag1); p = ufs_get_direct_data_ptr(uspi, ufsi, ufs_fragstoblks(frag1));
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
if (!tmp ) if (!tmp )
ufs_panic (sb, "ufs_trunc_direct", "internal error"); ufs_panic (sb, "ufs_trunc_direct", "internal error");
frag2 -= frag1; frag2 -= frag1;
...@@ -121,12 +124,11 @@ static int ufs_trunc_direct (struct inode * inode) ...@@ -121,12 +124,11 @@ static int ufs_trunc_direct (struct inode * inode)
* Free whole blocks * Free whole blocks
*/ */
for (i = block1 ; i < block2; i++) { for (i = block1 ; i < block2; i++) {
p = ufsi->i_u1.i_data + i; p = ufs_get_direct_data_ptr(uspi, ufsi, i);
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
if (!tmp) if (!tmp)
continue; continue;
ufs_data_ptr_clear(uspi, p);
*p = 0;
if (free_count == 0) { if (free_count == 0) {
frag_to_free = tmp; frag_to_free = tmp;
...@@ -150,13 +152,12 @@ static int ufs_trunc_direct (struct inode * inode) ...@@ -150,13 +152,12 @@ static int ufs_trunc_direct (struct inode * inode)
/* /*
* Free last free fragments * Free last free fragments
*/ */
p = ufsi->i_u1.i_data + ufs_fragstoblks (frag3); p = ufs_get_direct_data_ptr(uspi, ufsi, ufs_fragstoblks(frag3));
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
if (!tmp ) if (!tmp )
ufs_panic(sb, "ufs_truncate_direct", "internal error"); ufs_panic(sb, "ufs_truncate_direct", "internal error");
frag4 = ufs_fragnum (frag4); frag4 = ufs_fragnum (frag4);
ufs_data_ptr_clear(uspi, p);
*p = 0;
ufs_free_fragments (inode, tmp, frag4); ufs_free_fragments (inode, tmp, frag4);
mark_inode_dirty(inode); mark_inode_dirty(inode);
...@@ -167,17 +168,20 @@ static int ufs_trunc_direct (struct inode * inode) ...@@ -167,17 +168,20 @@ static int ufs_trunc_direct (struct inode * inode)
} }
static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p) static int ufs_trunc_indirect(struct inode *inode, u64 offset, void *p)
{ {
struct super_block * sb; struct super_block * sb;
struct ufs_sb_private_info * uspi; struct ufs_sb_private_info * uspi;
struct ufs_buffer_head * ind_ubh; struct ufs_buffer_head * ind_ubh;
__fs32 * ind; void *ind;
unsigned indirect_block, i, tmp; u64 tmp, indirect_block, i, frag_to_free;
unsigned frag_to_free, free_count; unsigned free_count;
int retry; int retry;
UFSD("ENTER\n"); UFSD("ENTER: ino %lu, offset %llu, p: %p\n",
inode->i_ino, (unsigned long long)offset, p);
BUG_ON(!p);
sb = inode->i_sb; sb = inode->i_sb;
uspi = UFS_SB(sb)->s_uspi; uspi = UFS_SB(sb)->s_uspi;
...@@ -186,27 +190,27 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p) ...@@ -186,27 +190,27 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p)
free_count = 0; free_count = 0;
retry = 0; retry = 0;
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
if (!tmp) if (!tmp)
return 0; return 0;
ind_ubh = ubh_bread(sb, tmp, uspi->s_bsize); ind_ubh = ubh_bread(sb, tmp, uspi->s_bsize);
if (tmp != fs32_to_cpu(sb, *p)) { if (tmp != ufs_data_ptr_to_cpu(sb, p)) {
ubh_brelse (ind_ubh); ubh_brelse (ind_ubh);
return 1; return 1;
} }
if (!ind_ubh) { if (!ind_ubh) {
*p = 0; ufs_data_ptr_clear(uspi, p);
return 0; return 0;
} }
indirect_block = (DIRECT_BLOCK > offset) ? (DIRECT_BLOCK - offset) : 0; indirect_block = (DIRECT_BLOCK > offset) ? (DIRECT_BLOCK - offset) : 0;
for (i = indirect_block; i < uspi->s_apb; i++) { for (i = indirect_block; i < uspi->s_apb; i++) {
ind = ubh_get_addr32 (ind_ubh, i); ind = ubh_get_data_ptr(uspi, ind_ubh, i);
tmp = fs32_to_cpu(sb, *ind); tmp = ufs_data_ptr_to_cpu(sb, ind);
if (!tmp) if (!tmp)
continue; continue;
*ind = 0; ufs_data_ptr_clear(uspi, ind);
ubh_mark_buffer_dirty(ind_ubh); ubh_mark_buffer_dirty(ind_ubh);
if (free_count == 0) { if (free_count == 0) {
frag_to_free = tmp; frag_to_free = tmp;
...@@ -226,11 +230,12 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p) ...@@ -226,11 +230,12 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p)
ufs_free_blocks (inode, frag_to_free, free_count); ufs_free_blocks (inode, frag_to_free, free_count);
} }
for (i = 0; i < uspi->s_apb; i++) for (i = 0; i < uspi->s_apb; i++)
if (*ubh_get_addr32(ind_ubh,i)) if (!ufs_is_data_ptr_zero(uspi,
ubh_get_data_ptr(uspi, ind_ubh, i)))
break; break;
if (i >= uspi->s_apb) { if (i >= uspi->s_apb) {
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
*p = 0; ufs_data_ptr_clear(uspi, p);
ufs_free_blocks (inode, tmp, uspi->s_fpb); ufs_free_blocks (inode, tmp, uspi->s_fpb);
mark_inode_dirty(inode); mark_inode_dirty(inode);
...@@ -248,13 +253,13 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p) ...@@ -248,13 +253,13 @@ static int ufs_trunc_indirect (struct inode * inode, unsigned offset, __fs32 *p)
return retry; return retry;
} }
static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p) static int ufs_trunc_dindirect(struct inode *inode, u64 offset, void *p)
{ {
struct super_block * sb; struct super_block * sb;
struct ufs_sb_private_info * uspi; struct ufs_sb_private_info * uspi;
struct ufs_buffer_head * dind_bh; struct ufs_buffer_head *dind_bh;
unsigned i, tmp, dindirect_block; u64 i, tmp, dindirect_block;
__fs32 * dind; void *dind;
int retry = 0; int retry = 0;
UFSD("ENTER\n"); UFSD("ENTER\n");
...@@ -266,22 +271,22 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p) ...@@ -266,22 +271,22 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p)
? ((DIRECT_BLOCK - offset) >> uspi->s_apbshift) : 0; ? ((DIRECT_BLOCK - offset) >> uspi->s_apbshift) : 0;
retry = 0; retry = 0;
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
if (!tmp) if (!tmp)
return 0; return 0;
dind_bh = ubh_bread(sb, tmp, uspi->s_bsize); dind_bh = ubh_bread(sb, tmp, uspi->s_bsize);
if (tmp != fs32_to_cpu(sb, *p)) { if (tmp != ufs_data_ptr_to_cpu(sb, p)) {
ubh_brelse (dind_bh); ubh_brelse (dind_bh);
return 1; return 1;
} }
if (!dind_bh) { if (!dind_bh) {
*p = 0; ufs_data_ptr_clear(uspi, p);
return 0; return 0;
} }
for (i = dindirect_block ; i < uspi->s_apb ; i++) { for (i = dindirect_block ; i < uspi->s_apb ; i++) {
dind = ubh_get_addr32 (dind_bh, i); dind = ubh_get_data_ptr(uspi, dind_bh, i);
tmp = fs32_to_cpu(sb, *dind); tmp = ufs_data_ptr_to_cpu(sb, dind);
if (!tmp) if (!tmp)
continue; continue;
retry |= ufs_trunc_indirect (inode, offset + (i << uspi->s_apbshift), dind); retry |= ufs_trunc_indirect (inode, offset + (i << uspi->s_apbshift), dind);
...@@ -289,11 +294,12 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p) ...@@ -289,11 +294,12 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p)
} }
for (i = 0; i < uspi->s_apb; i++) for (i = 0; i < uspi->s_apb; i++)
if (*ubh_get_addr32 (dind_bh, i)) if (!ufs_is_data_ptr_zero(uspi,
ubh_get_data_ptr(uspi, dind_bh, i)))
break; break;
if (i >= uspi->s_apb) { if (i >= uspi->s_apb) {
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
*p = 0; ufs_data_ptr_clear(uspi, p);
ufs_free_blocks(inode, tmp, uspi->s_fpb); ufs_free_blocks(inode, tmp, uspi->s_fpb);
mark_inode_dirty(inode); mark_inode_dirty(inode);
...@@ -311,34 +317,33 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p) ...@@ -311,34 +317,33 @@ static int ufs_trunc_dindirect (struct inode *inode, unsigned offset, __fs32 *p)
return retry; return retry;
} }
static int ufs_trunc_tindirect (struct inode * inode) static int ufs_trunc_tindirect(struct inode *inode)
{ {
struct super_block *sb = inode->i_sb;
struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
struct ufs_inode_info *ufsi = UFS_I(inode); struct ufs_inode_info *ufsi = UFS_I(inode);
struct super_block * sb;
struct ufs_sb_private_info * uspi;
struct ufs_buffer_head * tind_bh; struct ufs_buffer_head * tind_bh;
unsigned tindirect_block, tmp, i; u64 tindirect_block, tmp, i;
__fs32 * tind, * p; void *tind, *p;
int retry; int retry;
UFSD("ENTER\n"); UFSD("ENTER\n");
sb = inode->i_sb;
uspi = UFS_SB(sb)->s_uspi;
retry = 0; retry = 0;
tindirect_block = (DIRECT_BLOCK > (UFS_NDADDR + uspi->s_apb + uspi->s_2apb)) tindirect_block = (DIRECT_BLOCK > (UFS_NDADDR + uspi->s_apb + uspi->s_2apb))
? ((DIRECT_BLOCK - UFS_NDADDR - uspi->s_apb - uspi->s_2apb) >> uspi->s_2apbshift) : 0; ? ((DIRECT_BLOCK - UFS_NDADDR - uspi->s_apb - uspi->s_2apb) >> uspi->s_2apbshift) : 0;
p = ufsi->i_u1.i_data + UFS_TIND_BLOCK;
if (!(tmp = fs32_to_cpu(sb, *p))) p = ufs_get_direct_data_ptr(uspi, ufsi, UFS_TIND_BLOCK);
if (!(tmp = ufs_data_ptr_to_cpu(sb, p)))
return 0; return 0;
tind_bh = ubh_bread (sb, tmp, uspi->s_bsize); tind_bh = ubh_bread (sb, tmp, uspi->s_bsize);
if (tmp != fs32_to_cpu(sb, *p)) { if (tmp != ufs_data_ptr_to_cpu(sb, p)) {
ubh_brelse (tind_bh); ubh_brelse (tind_bh);
return 1; return 1;
} }
if (!tind_bh) { if (!tind_bh) {
*p = 0; ufs_data_ptr_clear(uspi, p);
return 0; return 0;
} }
...@@ -349,11 +354,12 @@ static int ufs_trunc_tindirect (struct inode * inode) ...@@ -349,11 +354,12 @@ static int ufs_trunc_tindirect (struct inode * inode)
ubh_mark_buffer_dirty(tind_bh); ubh_mark_buffer_dirty(tind_bh);
} }
for (i = 0; i < uspi->s_apb; i++) for (i = 0; i < uspi->s_apb; i++)
if (*ubh_get_addr32 (tind_bh, i)) if (!ufs_is_data_ptr_zero(uspi,
ubh_get_data_ptr(uspi, tind_bh, i)))
break; break;
if (i >= uspi->s_apb) { if (i >= uspi->s_apb) {
tmp = fs32_to_cpu(sb, *p); tmp = ufs_data_ptr_to_cpu(sb, p);
*p = 0; ufs_data_ptr_clear(uspi, p);
ufs_free_blocks(inode, tmp, uspi->s_fpb); ufs_free_blocks(inode, tmp, uspi->s_fpb);
mark_inode_dirty(inode); mark_inode_dirty(inode);
...@@ -375,7 +381,8 @@ static int ufs_alloc_lastblock(struct inode *inode) ...@@ -375,7 +381,8 @@ static int ufs_alloc_lastblock(struct inode *inode)
int err = 0; int err = 0;
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
struct ufs_sb_private_info *uspi = UFS_SB(inode->i_sb)->s_uspi; struct ufs_sb_private_info *uspi = UFS_SB(inode->i_sb)->s_uspi;
unsigned lastfrag, i, end; unsigned i, end;
sector_t lastfrag;
struct page *lastpage; struct page *lastpage;
struct buffer_head *bh; struct buffer_head *bh;
...@@ -430,7 +437,9 @@ int ufs_truncate(struct inode *inode, loff_t old_i_size) ...@@ -430,7 +437,9 @@ int ufs_truncate(struct inode *inode, loff_t old_i_size)
struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
int retry, err = 0; int retry, err = 0;
UFSD("ENTER\n"); UFSD("ENTER: ino %lu, i_size: %llu, old_i_size: %llu\n",
inode->i_ino, (unsigned long long)i_size_read(inode),
(unsigned long long)old_i_size);
if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
S_ISLNK(inode->i_mode))) S_ISLNK(inode->i_mode)))
...@@ -450,10 +459,12 @@ int ufs_truncate(struct inode *inode, loff_t old_i_size) ...@@ -450,10 +459,12 @@ int ufs_truncate(struct inode *inode, loff_t old_i_size)
lock_kernel(); lock_kernel();
while (1) { while (1) {
retry = ufs_trunc_direct(inode); retry = ufs_trunc_direct(inode);
retry |= ufs_trunc_indirect (inode, UFS_IND_BLOCK, retry |= ufs_trunc_indirect(inode, UFS_IND_BLOCK,
(__fs32 *) &ufsi->i_u1.i_data[UFS_IND_BLOCK]); ufs_get_direct_data_ptr(uspi, ufsi,
retry |= ufs_trunc_dindirect (inode, UFS_IND_BLOCK + uspi->s_apb, UFS_IND_BLOCK));
(__fs32 *) &ufsi->i_u1.i_data[UFS_DIND_BLOCK]); retry |= ufs_trunc_dindirect(inode, UFS_IND_BLOCK + uspi->s_apb,
ufs_get_direct_data_ptr(uspi, ufsi,
UFS_DIND_BLOCK));
retry |= ufs_trunc_tindirect (inode); retry |= ufs_trunc_tindirect (inode);
if (!retry) if (!retry)
break; break;
......
...@@ -305,8 +305,22 @@ static inline void *get_usb_offset(struct ufs_sb_private_info *uspi, ...@@ -305,8 +305,22 @@ static inline void *get_usb_offset(struct ufs_sb_private_info *uspi,
(((__fs32*)((ubh)->bh[(begin) >> (uspi->s_fshift-2)]->b_data)) + \ (((__fs32*)((ubh)->bh[(begin) >> (uspi->s_fshift-2)]->b_data)) + \
((begin) & ((uspi->s_fsize>>2) - 1))) ((begin) & ((uspi->s_fsize>>2) - 1)))
#define ubh_get_addr64(ubh,begin) \
(((__fs64*)((ubh)->bh[(begin) >> (uspi->s_fshift-3)]->b_data)) + \
((begin) & ((uspi->s_fsize>>3) - 1)))
#define ubh_get_addr ubh_get_addr8 #define ubh_get_addr ubh_get_addr8
static inline void *ubh_get_data_ptr(struct ufs_sb_private_info *uspi,
struct ufs_buffer_head *ubh,
u64 blk)
{
if (uspi->fs_magic == UFS2_MAGIC)
return ubh_get_addr64(ubh, blk);
else
return ubh_get_addr32(ubh, blk);
}
#define ubh_blkmap(ubh,begin,bit) \ #define ubh_blkmap(ubh,begin,bit) \
((*ubh_get_addr(ubh, (begin) + ((bit) >> 3)) >> ((bit) & 7)) & (0xff >> (UFS_MAXFRAG - uspi->s_fpb))) ((*ubh_get_addr(ubh, (begin) + ((bit) >> 3)) >> ((bit) & 7)) & (0xff >> (UFS_MAXFRAG - uspi->s_fpb)))
...@@ -507,3 +521,46 @@ static inline void ufs_fragacct (struct super_block * sb, unsigned blockmap, ...@@ -507,3 +521,46 @@ static inline void ufs_fragacct (struct super_block * sb, unsigned blockmap,
if (fragsize > 0 && fragsize < uspi->s_fpb) if (fragsize > 0 && fragsize < uspi->s_fpb)
fs32_add(sb, &fraglist[fragsize], cnt); fs32_add(sb, &fraglist[fragsize], cnt);
} }
static inline void *ufs_get_direct_data_ptr(struct ufs_sb_private_info *uspi,
struct ufs_inode_info *ufsi,
unsigned blk)
{
BUG_ON(blk > UFS_TIND_BLOCK);
return uspi->fs_magic == UFS2_MAGIC ?
(void *)&ufsi->i_u1.u2_i_data[blk] :
(void *)&ufsi->i_u1.i_data[blk];
}
static inline u64 ufs_data_ptr_to_cpu(struct super_block *sb, void *p)
{
return UFS_SB(sb)->s_uspi->fs_magic == UFS2_MAGIC ?
fs64_to_cpu(sb, *(__fs64 *)p) :
fs32_to_cpu(sb, *(__fs32 *)p);
}
static inline void ufs_cpu_to_data_ptr(struct super_block *sb, void *p, u64 val)
{
if (UFS_SB(sb)->s_uspi->fs_magic == UFS2_MAGIC)
*(__fs64 *)p = cpu_to_fs64(sb, val);
else
*(__fs32 *)p = cpu_to_fs32(sb, val);
}
static inline void ufs_data_ptr_clear(struct ufs_sb_private_info *uspi,
void *p)
{
if (uspi->fs_magic == UFS2_MAGIC)
*(__fs64 *)p = 0;
else
*(__fs32 *)p = 0;
}
static inline int ufs_is_data_ptr_zero(struct ufs_sb_private_info *uspi,
void *p)
{
if (uspi->fs_magic == UFS2_MAGIC)
return *(__fs64 *)p == 0;
else
return *(__fs32 *)p == 0;
}
...@@ -40,6 +40,7 @@ typedef __u64 __fs64; ...@@ -40,6 +40,7 @@ typedef __u64 __fs64;
typedef __u32 __fs32; typedef __u32 __fs32;
typedef __u16 __fs16; typedef __u16 __fs16;
#else #else
#include <asm/div64.h>
typedef __u64 __bitwise __fs64; typedef __u64 __bitwise __fs64;
typedef __u32 __bitwise __fs32; typedef __u32 __bitwise __fs32;
typedef __u16 __bitwise __fs16; typedef __u16 __bitwise __fs16;
...@@ -266,13 +267,6 @@ typedef __u16 __bitwise __fs16; ...@@ -266,13 +267,6 @@ typedef __u16 __bitwise __fs16;
#define ufs_inotofsba(x) (((u64)ufs_cgimin(ufs_inotocg(x))) + ufs_inotocgoff(x) / uspi->s_inopf) #define ufs_inotofsba(x) (((u64)ufs_cgimin(ufs_inotocg(x))) + ufs_inotocgoff(x) / uspi->s_inopf)
#define ufs_inotofsbo(x) ((x) % uspi->s_inopf) #define ufs_inotofsbo(x) ((x) % uspi->s_inopf)
/*
* Give cylinder group number for a file system block.
* Give cylinder group block number for a file system block.
*/
#define ufs_dtog(d) ((d) / uspi->s_fpg)
#define ufs_dtogd(d) ((d) % uspi->s_fpg)
/* /*
* Compute the cylinder and rotational position of a cyl block addr. * Compute the cylinder and rotational position of a cyl block addr.
*/ */
...@@ -723,6 +717,7 @@ struct ufs_cg_private_info { ...@@ -723,6 +717,7 @@ struct ufs_cg_private_info {
__u32 c_nclusterblks; /* number of clusters this cg */ __u32 c_nclusterblks; /* number of clusters this cg */
}; };
struct ufs_sb_private_info { struct ufs_sb_private_info {
struct ufs_buffer_head s_ubh; /* buffer containing super block */ struct ufs_buffer_head s_ubh; /* buffer containing super block */
struct ufs_csum_core cs_total; struct ufs_csum_core cs_total;
...@@ -952,9 +947,9 @@ struct ufs_super_block_third { ...@@ -952,9 +947,9 @@ struct ufs_super_block_third {
#ifdef __KERNEL__ #ifdef __KERNEL__
/* balloc.c */ /* balloc.c */
extern void ufs_free_fragments (struct inode *, unsigned, unsigned); extern void ufs_free_fragments (struct inode *, u64, unsigned);
extern void ufs_free_blocks (struct inode *, unsigned, unsigned); extern void ufs_free_blocks (struct inode *, u64, unsigned);
extern unsigned ufs_new_fragments(struct inode *, __fs32 *, unsigned, unsigned, extern u64 ufs_new_fragments(struct inode *, void *, u64, u64,
unsigned, int *, struct page *); unsigned, int *, struct page *);
/* cylinder.c */ /* cylinder.c */
...@@ -1016,6 +1011,22 @@ static inline struct ufs_inode_info *UFS_I(struct inode *inode) ...@@ -1016,6 +1011,22 @@ static inline struct ufs_inode_info *UFS_I(struct inode *inode)
return container_of(inode, struct ufs_inode_info, vfs_inode); return container_of(inode, struct ufs_inode_info, vfs_inode);
} }
/*
* Give cylinder group number for a file system block.
* Give cylinder group block number for a file system block.
*/
/* #define ufs_dtog(d) ((d) / uspi->s_fpg) */
static inline u64 ufs_dtog(struct ufs_sb_private_info * uspi, u64 b)
{
do_div(b, uspi->s_fpg);
return b;
}
/* #define ufs_dtogd(d) ((d) % uspi->s_fpg) */
static inline u32 ufs_dtogd(struct ufs_sb_private_info * uspi, u64 b)
{
return do_div(b, uspi->s_fpg);
}
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __LINUX_UFS_FS_H */ #endif /* __LINUX_UFS_FS_H */
...@@ -25,7 +25,7 @@ struct ufs_inode_info { ...@@ -25,7 +25,7 @@ struct ufs_inode_info {
__u32 i_unused2; __u32 i_unused2;
__u32 i_oeftflag; __u32 i_oeftflag;
__u16 i_osync; __u16 i_osync;
__u32 i_lastfrag; __u64 i_lastfrag;
__u32 i_dir_start_lookup; __u32 i_dir_start_lookup;
struct inode vfs_inode; struct inode vfs_inode;
}; };
......
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