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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
ext2
/
inode.c
diff --git
a/fs/ext2/inode.c
b/fs/ext2/inode.c
index
c6a0128
..
2f0c404
100644
(file)
--- a/
fs/ext2/inode.c
+++ b/
fs/ext2/inode.c
@@
-685,7
+685,7
@@
ext2_writepages(struct address_space *mapping, struct writeback_control *wbc)
return mpage_writepages(mapping, wbc, ext2_get_block);
}
return mpage_writepages(mapping, wbc, ext2_get_block);
}
-struct address_space_operations ext2_aops = {
+
const
struct address_space_operations ext2_aops = {
.readpage = ext2_readpage,
.readpages = ext2_readpages,
.writepage = ext2_writepage,
.readpage = ext2_readpage,
.readpages = ext2_readpages,
.writepage = ext2_writepage,
@@
-698,12
+698,12
@@
struct address_space_operations ext2_aops = {
.migratepage = buffer_migrate_page,
};
.migratepage = buffer_migrate_page,
};
-struct address_space_operations ext2_aops_xip = {
+
const
struct address_space_operations ext2_aops_xip = {
.bmap = ext2_bmap,
.get_xip_page = ext2_get_xip_page,
};
.bmap = ext2_bmap,
.get_xip_page = ext2_get_xip_page,
};
-struct address_space_operations ext2_nobh_aops = {
+
const
struct address_space_operations ext2_nobh_aops = {
.readpage = ext2_readpage,
.readpages = ext2_readpages,
.writepage = ext2_nobh_writepage,
.readpage = ext2_readpage,
.readpages = ext2_readpages,
.writepage = ext2_nobh_writepage,
@@
-914,7
+914,7
@@
void ext2_truncate (struct inode * inode)
return;
if (ext2_inode_is_fast_symlink(inode))
return;
return;
if (ext2_inode_is_fast_symlink(inode))
return;
- if (IS_APPEND(inode) || IS_I
MMUTABLE
(inode))
+ if (IS_APPEND(inode) || IS_I
XORUNLINK
(inode))
return;
ext2_discard_prealloc(inode);
return;
ext2_discard_prealloc(inode);
@@
-1145,7
+1145,6
@@
void ext2_read_inode (struct inode * inode)
brelse (bh);
goto bad_inode;
}
brelse (bh);
goto bad_inode;
}
- inode->i_blksize = PAGE_SIZE; /* This is the optimal IO size (for stat), not the fs block size */
inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
ei->i_flags = le32_to_cpu(raw_inode->i_flags);
ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);
inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
ei->i_flags = le32_to_cpu(raw_inode->i_flags);
ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);