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/smbfs | |
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/smbfs')
-rw-r--r-- | fs/smbfs/inode.c | 2 | ||||
-rw-r--r-- | fs/smbfs/proc.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 92cf60aa6121..2c122ee83adb 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c | |||
@@ -166,7 +166,6 @@ smb_get_inode_attr(struct inode *inode, struct smb_fattr *fattr) | |||
166 | fattr->f_mtime = inode->i_mtime; | 166 | fattr->f_mtime = inode->i_mtime; |
167 | fattr->f_ctime = inode->i_ctime; | 167 | fattr->f_ctime = inode->i_ctime; |
168 | fattr->f_atime = inode->i_atime; | 168 | fattr->f_atime = inode->i_atime; |
169 | fattr->f_blksize= inode->i_blksize; | ||
170 | fattr->f_blocks = inode->i_blocks; | 169 | fattr->f_blocks = inode->i_blocks; |
171 | 170 | ||
172 | fattr->attr = SMB_I(inode)->attr; | 171 | fattr->attr = SMB_I(inode)->attr; |
@@ -200,7 +199,6 @@ smb_set_inode_attr(struct inode *inode, struct smb_fattr *fattr) | |||
200 | inode->i_uid = fattr->f_uid; | 199 | inode->i_uid = fattr->f_uid; |
201 | inode->i_gid = fattr->f_gid; | 200 | inode->i_gid = fattr->f_gid; |
202 | inode->i_ctime = fattr->f_ctime; | 201 | inode->i_ctime = fattr->f_ctime; |
203 | inode->i_blksize= fattr->f_blksize; | ||
204 | inode->i_blocks = fattr->f_blocks; | 202 | inode->i_blocks = fattr->f_blocks; |
205 | inode->i_size = fattr->f_size; | 203 | inode->i_size = fattr->f_size; |
206 | inode->i_mtime = fattr->f_mtime; | 204 | inode->i_mtime = fattr->f_mtime; |
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c index c3495059889d..40e174db9872 100644 --- a/fs/smbfs/proc.c +++ b/fs/smbfs/proc.c | |||
@@ -1826,7 +1826,6 @@ smb_init_dirent(struct smb_sb_info *server, struct smb_fattr *fattr) | |||
1826 | fattr->f_nlink = 1; | 1826 | fattr->f_nlink = 1; |
1827 | fattr->f_uid = server->mnt->uid; | 1827 | fattr->f_uid = server->mnt->uid; |
1828 | fattr->f_gid = server->mnt->gid; | 1828 | fattr->f_gid = server->mnt->gid; |
1829 | fattr->f_blksize = SMB_ST_BLKSIZE; | ||
1830 | fattr->f_unix = 0; | 1829 | fattr->f_unix = 0; |
1831 | } | 1830 | } |
1832 | 1831 | ||