git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
ufs
/
inode.c
diff --git
a/fs/ufs/inode.c
b/fs/ufs/inode.c
index
718627c
..
3c3f62c
100644
(file)
--- a/
fs/ufs/inode.c
+++ b/
fs/ufs/inode.c
@@
-61,7
+61,7
@@
static int ufs_block_to_path(struct inode *inode, sector_t i_block, sector_t off
int n = 0;
int n = 0;
- UFSD(("ptrs=uspi->s_apb = %d,double_blocks=%d \n",ptrs,double_blocks));
+ UFSD(("ptrs=uspi->s_apb = %d,double_blocks=%
l
d \n",ptrs,double_blocks));
if (i_block < 0) {
ufs_warning(inode->i_sb, "ufs_block_to_path", "block < 0");
} else if (i_block < direct_blocks) {
if (i_block < 0) {
ufs_warning(inode->i_sb, "ufs_block_to_path", "block < 0");
} else if (i_block < direct_blocks) {
@@
-104,7
+104,7
@@
u64 ufs_frag_map(struct inode *inode, sector_t frag)
unsigned flags = UFS_SB(sb)->s_flags;
u64 temp = 0L;
unsigned flags = UFS_SB(sb)->s_flags;
u64 temp = 0L;
- UFSD((": frag = %l
u depth = %d\n",frag,
depth));
+ UFSD((": frag = %l
lu depth = %d\n", (unsigned long long)frag,
depth));
UFSD((": uspi->s_fpbshift = %d ,uspi->s_apbmask = %x, mask=%llx\n",uspi->s_fpbshift,uspi->s_apbmask,mask));
if (depth == 0)
UFSD((": uspi->s_fpbshift = %d ,uspi->s_apbmask = %x, mask=%llx\n",uspi->s_fpbshift,uspi->s_apbmask,mask));
if (depth == 0)
@@
-365,9
+365,10
@@
repeat:
sync_dirty_buffer(bh);
inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
sync_dirty_buffer(bh);
inode->i_ctime = CURRENT_TIME_SEC;
mark_inode_dirty(inode);
+ UFSD(("result %u\n", tmp + blockoff));
out:
brelse (bh);
out:
brelse (bh);
- UFSD(("EXIT
, result %u\n", tmp + blockoff))
+ UFSD(("EXIT
\n"));
return result;
}
return result;
}
@@
-375,7
+376,7
@@
out:
* This function gets the block which contains the fragment.
*/
* This function gets the block which contains the fragment.
*/
-
static
int ufs_getfrag_block (struct inode *inode, sector_t fragment, struct buffer_head *bh_result, int create)
+int ufs_getfrag_block (struct inode *inode, sector_t fragment, struct buffer_head *bh_result, int create)
{
struct super_block * sb = inode->i_sb;
struct ufs_sb_private_info * uspi = UFS_SB(sb)->s_uspi;
{
struct super_block * sb = inode->i_sb;
struct ufs_sb_private_info * uspi = UFS_SB(sb)->s_uspi;
@@
-386,7
+387,7
@@
static int ufs_getfrag_block (struct inode *inode, sector_t fragment, struct buf
if (!create) {
phys64 = ufs_frag_map(inode, fragment);
if (!create) {
phys64 = ufs_frag_map(inode, fragment);
- UFSD(("phys64 = %lu \n",phys64));
+ UFSD(("phys64 = %l
l
u \n",phys64));
if (phys64)
map_bh(bh_result, sb, phys64);
return 0;
if (phys64)
map_bh(bh_result, sb, phys64);
return 0;
@@
-401,7
+402,7
@@
static int ufs_getfrag_block (struct inode *inode, sector_t fragment, struct buf
lock_kernel();
lock_kernel();
- UFSD(("ENTER, ino %lu, fragment %
u\n", inode->i_ino,
fragment))
+ UFSD(("ENTER, ino %lu, fragment %
llu\n", inode->i_ino, (unsigned long long)
fragment))
if (fragment < 0)
goto abort_negative;
if (fragment >
if (fragment < 0)
goto abort_negative;
if (fragment >
@@
-804,6
+805,7
@@
int ufs_sync_inode (struct inode *inode)
void ufs_delete_inode (struct inode * inode)
{
void ufs_delete_inode (struct inode * inode)
{
+ truncate_inode_pages(&inode->i_data, 0);
/*UFS_I(inode)->i_dtime = CURRENT_TIME;*/
lock_kernel();
mark_inode_dirty(inode);
/*UFS_I(inode)->i_dtime = CURRENT_TIME;*/
lock_kernel();
mark_inode_dirty(inode);