Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba52de12 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Linus Torvalds
Browse files

[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: default avatar"Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 577c4eb0

arch/powerpc/platforms/cell/spufs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ spufs_new_inode(struct super_block *sb, int mode) 
	inode->i_mode = mode;

	inode->i_uid = current->fsuid;

	inode->i_gid = current->fsgid;

	inode->i_blksize = PAGE_CACHE_SIZE;

	inode->i_blocks = 0;

	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

out:

arch/s390/hypfs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) 
		ret->i_mode = mode;

		ret->i_uid = hypfs_info->uid;

		ret->i_gid = hypfs_info->gid;

		ret->i_blksize = PAGE_CACHE_SIZE;

		ret->i_blocks = 0;

		ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;

		if (mode & S_IFDIR)

drivers/block/loop.c

+5 −2
Original line number Diff line number Diff line
@@ -662,7 +662,8 @@ static void do_loop_switch(struct loop_device *lo, struct switch_request *p) 


	mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);

	lo->lo_backing_file = file;

	lo->lo_blocksize = mapping->host->i_blksize;

	lo->lo_blocksize = S_ISBLK(mapping->host->i_mode) ?

		mapping->host->i_bdev->bd_block_size : PAGE_SIZE;

	lo->old_gfp_mask = mapping_gfp_mask(mapping);

	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));

	complete(&p->wait);
@@ -794,7 +795,9 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file, 
		if (!(lo_flags & LO_FLAGS_USE_AOPS) && !file->f_op->write)

			lo_flags |= LO_FLAGS_READ_ONLY;



		lo_blocksize = inode->i_blksize;

		lo_blocksize = S_ISBLK(inode->i_mode) ?

			inode->i_bdev->bd_block_size : PAGE_SIZE;



		error = 0;

	} else {

		goto out_putf;

drivers/infiniband/hw/ipath/ipath_fs.c

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry, 
	inode->i_mode = mode;

	inode->i_uid = 0;

	inode->i_gid = 0;

	inode->i_blksize = PAGE_CACHE_SIZE;

	inode->i_blocks = 0;

	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;

	inode->i_private = data;

drivers/isdn/capi/capifs.c

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ capifs_fill_super(struct super_block *s, void *data, int silent) 
	inode->i_ino = 1;

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;

	inode->i_blocks = 0;

	inode->i_blksize = 1024;

	inode->i_uid = inode->i_gid = 0;

	inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;

	inode->i_op = &simple_dir_inode_operations;
@@ -149,7 +148,6 @@ void capifs_new_ncci(unsigned int number, dev_t device) 
	if (!inode)

		return;

	inode->i_ino = number+2;

	inode->i_blksize = 1024;

	inode->i_uid = config.setuid ? config.uid : current->fsuid;

	inode->i_gid = config.setgid ? config.gid : current->fsgid;

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;