diff options
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/dlm/dlmfs.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/inode.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index 0ff0898a0b9c..0368c6402182 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c | |||
@@ -335,7 +335,6 @@ static struct inode *dlmfs_get_root_inode(struct super_block *sb) | |||
335 | inode->i_mode = mode; | 335 | inode->i_mode = mode; |
336 | inode->i_uid = current->fsuid; | 336 | inode->i_uid = current->fsuid; |
337 | inode->i_gid = current->fsgid; | 337 | inode->i_gid = current->fsgid; |
338 | inode->i_blksize = PAGE_CACHE_SIZE; | ||
339 | inode->i_blocks = 0; | 338 | inode->i_blocks = 0; |
340 | inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info; | 339 | inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info; |
341 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 340 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
@@ -362,7 +361,6 @@ static struct inode *dlmfs_get_inode(struct inode *parent, | |||
362 | inode->i_mode = mode; | 361 | inode->i_mode = mode; |
363 | inode->i_uid = current->fsuid; | 362 | inode->i_uid = current->fsuid; |
364 | inode->i_gid = current->fsgid; | 363 | inode->i_gid = current->fsgid; |
365 | inode->i_blksize = PAGE_CACHE_SIZE; | ||
366 | inode->i_blocks = 0; | 364 | inode->i_blocks = 0; |
367 | inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info; | 365 | inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info; |
368 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; | 366 | inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; |
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 69d3db569166..16e8e74dc966 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c | |||
@@ -269,7 +269,6 @@ int ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, | |||
269 | inode->i_mode = le16_to_cpu(fe->i_mode); | 269 | inode->i_mode = le16_to_cpu(fe->i_mode); |
270 | inode->i_uid = le32_to_cpu(fe->i_uid); | 270 | inode->i_uid = le32_to_cpu(fe->i_uid); |
271 | inode->i_gid = le32_to_cpu(fe->i_gid); | 271 | inode->i_gid = le32_to_cpu(fe->i_gid); |
272 | inode->i_blksize = (u32)osb->s_clustersize; | ||
273 | 272 | ||
274 | /* Fast symlinks will have i_size but no allocated clusters. */ | 273 | /* Fast symlinks will have i_size but no allocated clusters. */ |
275 | if (S_ISLNK(inode->i_mode) && !fe->i_clusters) | 274 | if (S_ISLNK(inode->i_mode) && !fe->i_clusters) |
@@ -1258,8 +1257,6 @@ leave: | |||
1258 | void ocfs2_refresh_inode(struct inode *inode, | 1257 | void ocfs2_refresh_inode(struct inode *inode, |
1259 | struct ocfs2_dinode *fe) | 1258 | struct ocfs2_dinode *fe) |
1260 | { | 1259 | { |
1261 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); | ||
1262 | |||
1263 | spin_lock(&OCFS2_I(inode)->ip_lock); | 1260 | spin_lock(&OCFS2_I(inode)->ip_lock); |
1264 | 1261 | ||
1265 | OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters); | 1262 | OCFS2_I(inode)->ip_clusters = le32_to_cpu(fe->i_clusters); |
@@ -1270,7 +1267,6 @@ void ocfs2_refresh_inode(struct inode *inode, | |||
1270 | inode->i_uid = le32_to_cpu(fe->i_uid); | 1267 | inode->i_uid = le32_to_cpu(fe->i_uid); |
1271 | inode->i_gid = le32_to_cpu(fe->i_gid); | 1268 | inode->i_gid = le32_to_cpu(fe->i_gid); |
1272 | inode->i_mode = le16_to_cpu(fe->i_mode); | 1269 | inode->i_mode = le16_to_cpu(fe->i_mode); |
1273 | inode->i_blksize = (u32) osb->s_clustersize; | ||
1274 | if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0) | 1270 | if (S_ISLNK(inode->i_mode) && le32_to_cpu(fe->i_clusters) == 0) |
1275 | inode->i_blocks = 0; | 1271 | inode->i_blocks = 0; |
1276 | else | 1272 | else |