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/ntfs | |
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/ntfs')
-rw-r--r-- | fs/ntfs/inode.c | 4 | ||||
-rw-r--r-- | fs/ntfs/mft.c | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index 31852121b3f5..933dbd89c2a4 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c | |||
@@ -556,8 +556,6 @@ static int ntfs_read_locked_inode(struct inode *vi) | |||
556 | 556 | ||
557 | /* Setup the generic vfs inode parts now. */ | 557 | /* Setup the generic vfs inode parts now. */ |
558 | 558 | ||
559 | /* This is the optimal IO size (for stat), not the fs block size. */ | ||
560 | vi->i_blksize = PAGE_CACHE_SIZE; | ||
561 | /* | 559 | /* |
562 | * This is for checking whether an inode has changed w.r.t. a file so | 560 | * This is for checking whether an inode has changed w.r.t. a file so |
563 | * that the file can be updated if necessary (compare with f_version). | 561 | * that the file can be updated if necessary (compare with f_version). |
@@ -1234,7 +1232,6 @@ static int ntfs_read_locked_attr_inode(struct inode *base_vi, struct inode *vi) | |||
1234 | base_ni = NTFS_I(base_vi); | 1232 | base_ni = NTFS_I(base_vi); |
1235 | 1233 | ||
1236 | /* Just mirror the values from the base inode. */ | 1234 | /* Just mirror the values from the base inode. */ |
1237 | vi->i_blksize = base_vi->i_blksize; | ||
1238 | vi->i_version = base_vi->i_version; | 1235 | vi->i_version = base_vi->i_version; |
1239 | vi->i_uid = base_vi->i_uid; | 1236 | vi->i_uid = base_vi->i_uid; |
1240 | vi->i_gid = base_vi->i_gid; | 1237 | vi->i_gid = base_vi->i_gid; |
@@ -1504,7 +1501,6 @@ static int ntfs_read_locked_index_inode(struct inode *base_vi, struct inode *vi) | |||
1504 | ni = NTFS_I(vi); | 1501 | ni = NTFS_I(vi); |
1505 | base_ni = NTFS_I(base_vi); | 1502 | base_ni = NTFS_I(base_vi); |
1506 | /* Just mirror the values from the base inode. */ | 1503 | /* Just mirror the values from the base inode. */ |
1507 | vi->i_blksize = base_vi->i_blksize; | ||
1508 | vi->i_version = base_vi->i_version; | 1504 | vi->i_version = base_vi->i_version; |
1509 | vi->i_uid = base_vi->i_uid; | 1505 | vi->i_uid = base_vi->i_uid; |
1510 | vi->i_gid = base_vi->i_gid; | 1506 | vi->i_gid = base_vi->i_gid; |
diff --git a/fs/ntfs/mft.c b/fs/ntfs/mft.c index 578fb3d5e803..584260fd6848 100644 --- a/fs/ntfs/mft.c +++ b/fs/ntfs/mft.c | |||
@@ -2638,11 +2638,6 @@ mft_rec_already_initialized: | |||
2638 | } | 2638 | } |
2639 | vi->i_ino = bit; | 2639 | vi->i_ino = bit; |
2640 | /* | 2640 | /* |
2641 | * This is the optimal IO size (for stat), not the fs block | ||
2642 | * size. | ||
2643 | */ | ||
2644 | vi->i_blksize = PAGE_CACHE_SIZE; | ||
2645 | /* | ||
2646 | * This is for checking whether an inode has changed w.r.t. a | 2641 | * This is for checking whether an inode has changed w.r.t. a |
2647 | * file so that the file can be updated if necessary (compare | 2642 | * file so that the file can be updated if necessary (compare |
2648 | * with f_version). | 2643 | * with f_version). |