git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
fs
/
udf
/
inode.c
diff --git
a/fs/udf/inode.c
b/fs/udf/inode.c
index
2983afd
..
ae21a0e
100644
(file)
--- a/
fs/udf/inode.c
+++ b/
fs/udf/inode.c
@@
-132,7
+132,7
@@
static sector_t udf_bmap(struct address_space *mapping, sector_t block)
return generic_block_bmap(mapping,block,udf_get_block);
}
return generic_block_bmap(mapping,block,udf_get_block);
}
-struct address_space_operations udf_aops = {
+
const
struct address_space_operations udf_aops = {
.readpage = udf_readpage,
.writepage = udf_writepage,
.sync_page = block_sync_page,
.readpage = udf_readpage,
.writepage = udf_writepage,
.sync_page = block_sync_page,
@@
-916,8
+916,6
@@
__udf_read_inode(struct inode *inode)
* i_nlink = 1
* i_op = NULL;
*/
* i_nlink = 1
* i_op = NULL;
*/
- inode->i_blksize = PAGE_SIZE;
-
bh = udf_read_ptagged(inode->i_sb, UDF_I_LOCATION(inode), 0, &ident);
if (!bh)
bh = udf_read_ptagged(inode->i_sb, UDF_I_LOCATION(inode), 0, &ident);
if (!bh)
@@
-1167,7
+1165,7
@@
static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
inode->i_op = &udf_dir_inode_operations;
inode->i_fop = &udf_dir_operations;
inode->i_mode |= S_IFDIR;
inode->i_op = &udf_dir_inode_operations;
inode->i_fop = &udf_dir_operations;
inode->i_mode |= S_IFDIR;
- in
ode->i_nlink ++
;
+ in
c_nlink(inode)
;
break;
}
case ICBTAG_FILE_TYPE_REALTIME:
break;
}
case ICBTAG_FILE_TYPE_REALTIME: