From: "Theodore Ts'o" <tytso@mit.edu>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org
Subject: [patch 7/8] inode-diet: Use a union for i_blocks and i_size, i_rdev and i_devices
Date: Sun, 02 Jul 2006 20:53:40 -0400 [thread overview]
Message-ID: <20060703010023.720991000@candygram.thunk.org> (raw)
In-Reply-To: 20060703005333.706556000@candygram.thunk.org
[-- Attachment #1: inode-slim-7 --]
[-- Type: text/plain, Size: 1911 bytes --]
The i_blocks and i_size fields are only used for regular files. So we
move them into the union, along with i_rdev and i_devices, which are
only used by block or character devices.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Index: linux-2.6.17-mm5/include/linux/fs.h
===================================================================
--- linux-2.6.17-mm5.orig/include/linux/fs.h 2006-07-02 20:29:49.000000000 -0400
+++ linux-2.6.17-mm5/include/linux/fs.h 2006-07-02 20:29:52.000000000 -0400
@@ -501,15 +501,12 @@
unsigned int i_nlink;
uid_t i_uid;
gid_t i_gid;
- dev_t i_rdev;
loff_t i_size;
struct timespec i_atime;
struct timespec i_mtime;
struct timespec i_ctime;
unsigned int i_blkbits;
unsigned long i_version;
- blkcnt_t i_blocks;
- unsigned short i_bytes;
spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */
struct mutex i_mutex;
struct rw_semaphore i_alloc_sem;
@@ -522,11 +519,20 @@
#ifdef CONFIG_QUOTA
struct dquot *i_dquot[MAXQUOTAS];
#endif
- struct list_head i_devices;
union {
struct pipe_inode_info *i_pipe;
- struct block_device *i_bdev;
- struct cdev *i_cdev;
+ struct {
+ union {
+ struct block_device *i_bdev;
+ struct cdev *i_cdev;
+ };
+ dev_t i_rdev;
+ struct list_head i_devices;
+ };
+ struct {
+ unsigned short i_bytes;
+ blkcnt_t i_blocks;
+ };
};
__u32 i_generation;
Index: linux-2.6.17-mm5/fs/stat.c
===================================================================
--- linux-2.6.17-mm5.orig/fs/stat.c 2006-07-02 20:29:16.000000000 -0400
+++ linux-2.6.17-mm5/fs/stat.c 2006-07-02 20:29:52.000000000 -0400
@@ -32,7 +32,7 @@
stat->mtime = inode->i_mtime;
stat->ctime = inode->i_ctime;
stat->size = i_size_read(inode);
- stat->blocks = inode->i_blocks;
+ stat->blocks = S_ISREG(inode->i_mode) ? inode->i_blocks : 0;
stat->blksize = PAGE_CACHE_SIZE;
}
--
next prev parent reply other threads:[~2006-07-03 1:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-03 0:53 [patch 0/8] Inode slimming patches, part 1 Theodore Ts'o
2006-07-03 0:53 ` [patch 1/8] inode_diet: Replace inode.u.generic_ip with inode.i_private Theodore Ts'o
2006-07-03 0:53 ` [patch 2/8] inode-diet: Move i_pipe into a union Theodore Ts'o
2006-07-03 0:53 ` [patch 3/8] inode-diet: Move i_bdev " Theodore Ts'o
2006-07-03 0:53 ` [patch 4/8] inode-diet: Move i_cdev " Theodore Ts'o
2006-07-03 0:53 ` [patch 5/8] inode-diet: Eliminate i_blksize and use a per-superblock default Theodore Ts'o
2006-07-03 0:53 ` [patch 6/8] inode-diet: Move i_cindex from struct inode to struct file Theodore Ts'o
2006-07-03 9:05 ` Christoph Hellwig
2006-07-03 14:05 ` Theodore Tso
2006-07-03 0:53 ` Theodore Ts'o [this message]
2006-07-03 8:27 ` [patch 7/8] inode-diet: Use a union for i_blocks and i_size, i_rdev and i_devices Andrew Morton
2006-07-03 14:35 ` Hugh Dickins
2006-07-03 9:06 ` Christoph Hellwig
2006-07-03 14:02 ` Theodore Tso
2006-07-03 14:42 ` Jan Engelhardt
2006-07-03 15:18 ` H. Peter Anvin
2006-07-03 0:53 ` [patch 8/8] inode-diet: Fix size of i_blkbits, i_version, and i_dnotify_mask Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060703010023.720991000@candygram.thunk.org \
--to=tytso@mit.edu \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox