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/minix | |
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/minix')
-rw-r--r-- | fs/minix/bitmap.c | 2 | ||||
-rw-r--r-- | fs/minix/inode.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c index 4a6abc49418e..df6b1075b549 100644 --- a/fs/minix/bitmap.c +++ b/fs/minix/bitmap.c | |||
@@ -254,7 +254,7 @@ struct inode * minix_new_inode(const struct inode * dir, int * error) | |||
254 | inode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid; | 254 | inode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid; |
255 | inode->i_ino = j; | 255 | inode->i_ino = j; |
256 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; | 256 | inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; |
257 | inode->i_blocks = inode->i_blksize = 0; | 257 | inode->i_blocks = 0; |
258 | memset(&minix_i(inode)->u, 0, sizeof(minix_i(inode)->u)); | 258 | memset(&minix_i(inode)->u, 0, sizeof(minix_i(inode)->u)); |
259 | insert_inode_hash(inode); | 259 | insert_inode_hash(inode); |
260 | mark_inode_dirty(inode); | 260 | mark_inode_dirty(inode); |
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 826b9d830650..c11a4b9fb863 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
@@ -396,7 +396,7 @@ static void V1_minix_read_inode(struct inode * inode) | |||
396 | inode->i_mtime.tv_nsec = 0; | 396 | inode->i_mtime.tv_nsec = 0; |
397 | inode->i_atime.tv_nsec = 0; | 397 | inode->i_atime.tv_nsec = 0; |
398 | inode->i_ctime.tv_nsec = 0; | 398 | inode->i_ctime.tv_nsec = 0; |
399 | inode->i_blocks = inode->i_blksize = 0; | 399 | inode->i_blocks = 0; |
400 | for (i = 0; i < 9; i++) | 400 | for (i = 0; i < 9; i++) |
401 | minix_inode->u.i1_data[i] = raw_inode->i_zone[i]; | 401 | minix_inode->u.i1_data[i] = raw_inode->i_zone[i]; |
402 | minix_set_inode(inode, old_decode_dev(raw_inode->i_zone[0])); | 402 | minix_set_inode(inode, old_decode_dev(raw_inode->i_zone[0])); |
@@ -429,7 +429,7 @@ static void V2_minix_read_inode(struct inode * inode) | |||
429 | inode->i_mtime.tv_nsec = 0; | 429 | inode->i_mtime.tv_nsec = 0; |
430 | inode->i_atime.tv_nsec = 0; | 430 | inode->i_atime.tv_nsec = 0; |
431 | inode->i_ctime.tv_nsec = 0; | 431 | inode->i_ctime.tv_nsec = 0; |
432 | inode->i_blocks = inode->i_blksize = 0; | 432 | inode->i_blocks = 0; |
433 | for (i = 0; i < 10; i++) | 433 | for (i = 0; i < 10; i++) |
434 | minix_inode->u.i2_data[i] = raw_inode->i_zone[i]; | 434 | minix_inode->u.i2_data[i] = raw_inode->i_zone[i]; |
435 | minix_set_inode(inode, old_decode_dev(raw_inode->i_zone[0])); | 435 | minix_set_inode(inode, old_decode_dev(raw_inode->i_zone[0])); |