diff options
author | Theodore Ts'o <tytso@mit.edu> | 2006-09-27 04:50:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 11:26:18 -0400 |
commit | ba52de123d454b57369f291348266d86f4b35070 (patch) | |
tree | 3973f3f3c853b5857b6b64a027cadd4fe954e3b9 /fs/nfs | |
parent | 577c4eb09d1034d0739e3135fd2cff50588024be (diff) |
[PATCH] inode-diet: Eliminate i_blksize from the inode structure
This eliminates the i_blksize field from struct inode. Filesystems that want
to provide a per-inode st_blksize can do so by providing their own getattr
routine instead of using the generic_fillattr() function.
Note that some filesystems were providing pretty much random (and incorrect)
values for i_blksize.
[bunk@stusta.de: cleanup]
[akpm@osdl.org: generic_fillattr() fix]
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/inode.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 931f52a19579..bc9376ca86cd 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -277,10 +277,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr) | |||
277 | * report the blocks in 512byte units | 277 | * report the blocks in 512byte units |
278 | */ | 278 | */ |
279 | inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); | 279 | inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); |
280 | inode->i_blksize = inode->i_sb->s_blocksize; | ||
281 | } else { | 280 | } else { |
282 | inode->i_blocks = fattr->du.nfs2.blocks; | 281 | inode->i_blocks = fattr->du.nfs2.blocks; |
283 | inode->i_blksize = fattr->du.nfs2.blocksize; | ||
284 | } | 282 | } |
285 | nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); | 283 | nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); |
286 | nfsi->attrtimeo_timestamp = jiffies; | 284 | nfsi->attrtimeo_timestamp = jiffies; |
@@ -969,10 +967,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) | |||
969 | * report the blocks in 512byte units | 967 | * report the blocks in 512byte units |
970 | */ | 968 | */ |
971 | inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); | 969 | inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); |
972 | inode->i_blksize = inode->i_sb->s_blocksize; | ||
973 | } else { | 970 | } else { |
974 | inode->i_blocks = fattr->du.nfs2.blocks; | 971 | inode->i_blocks = fattr->du.nfs2.blocks; |
975 | inode->i_blksize = fattr->du.nfs2.blocksize; | ||
976 | } | 972 | } |
977 | 973 | ||
978 | if ((fattr->valid & NFS_ATTR_FATTR_V4) != 0 && | 974 | if ((fattr->valid & NFS_ATTR_FATTR_V4) != 0 && |