[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>
This commit is contained in:

committed by
Linus Torvalds

parent
577c4eb09d
commit
ba52de123d
@@ -512,7 +512,6 @@ struct inode {
|
||||
struct timespec i_mtime;
|
||||
struct timespec i_ctime;
|
||||
unsigned int i_blkbits;
|
||||
unsigned long i_blksize;
|
||||
unsigned long i_version;
|
||||
blkcnt_t i_blocks;
|
||||
unsigned short i_bytes;
|
||||
|
@@ -269,14 +269,8 @@ fill_post_wcc(struct svc_fh *fhp)
|
||||
fhp->fh_post_uid = inode->i_uid;
|
||||
fhp->fh_post_gid = inode->i_gid;
|
||||
fhp->fh_post_size = inode->i_size;
|
||||
if (inode->i_blksize) {
|
||||
fhp->fh_post_blksize = inode->i_blksize;
|
||||
fhp->fh_post_blocks = inode->i_blocks;
|
||||
} else {
|
||||
fhp->fh_post_blksize = BLOCK_SIZE;
|
||||
/* how much do we care for accuracy with MinixFS? */
|
||||
fhp->fh_post_blocks = (inode->i_size+511) >> 9;
|
||||
}
|
||||
fhp->fh_post_blksize = BLOCK_SIZE;
|
||||
fhp->fh_post_blocks = inode->i_blocks;
|
||||
fhp->fh_post_rdev[0] = htonl((u32)imajor(inode));
|
||||
fhp->fh_post_rdev[1] = htonl((u32)iminor(inode));
|
||||
fhp->fh_post_atime = inode->i_atime;
|
||||
|
@@ -89,7 +89,6 @@ struct smb_fattr {
|
||||
struct timespec f_atime;
|
||||
struct timespec f_mtime;
|
||||
struct timespec f_ctime;
|
||||
unsigned long f_blksize;
|
||||
unsigned long f_blocks;
|
||||
int f_unix;
|
||||
};
|
||||
|
Reference in New Issue
Block a user