From: "Theodore Ts'o" <tytso@mit.edu>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org
Subject: [patch 4/8] inode-diet: Move i_cdev into a union
Date: Sun, 02 Jul 2006 20:53:37 -0400 [thread overview]
Message-ID: <20060703010022.784625000@candygram.thunk.org> (raw)
In-Reply-To: 20060703005333.706556000@candygram.thunk.org
[-- Attachment #1: inode-slim-4 --]
[-- Type: text/plain, Size: 1640 bytes --]
Move the i_cdev pointer in struct inode into a union.
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:28:55.000000000 -0400
+++ linux-2.6.17-mm5/include/linux/fs.h 2006-07-02 20:28:58.000000000 -0400
@@ -527,8 +527,8 @@
union {
struct pipe_inode_info *i_pipe;
struct block_device *i_bdev;
+ struct cdev *i_cdev;
};
- struct cdev *i_cdev;
int i_cindex;
__u32 i_generation;
Index: linux-2.6.17-mm5/fs/file_table.c
===================================================================
--- linux-2.6.17-mm5.orig/fs/file_table.c 2006-07-02 20:25:46.000000000 -0400
+++ linux-2.6.17-mm5/fs/file_table.c 2006-07-02 20:28:58.000000000 -0400
@@ -176,7 +176,7 @@
if (file->f_op && file->f_op->release)
file->f_op->release(inode, file);
security_file_free(file);
- if (unlikely(inode->i_cdev != NULL))
+ if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))
cdev_put(inode->i_cdev);
fops_put(file->f_op);
if (file->f_mode & FMODE_WRITE)
Index: linux-2.6.17-mm5/fs/inode.c
===================================================================
--- linux-2.6.17-mm5.orig/fs/inode.c 2006-07-02 20:28:55.000000000 -0400
+++ linux-2.6.17-mm5/fs/inode.c 2006-07-02 20:28:58.000000000 -0400
@@ -256,7 +256,7 @@
inode->i_sb->s_op->clear_inode(inode);
if (S_ISBLK(inode->i_mode) && inode->i_bdev)
bd_forget(inode);
- if (inode->i_cdev)
+ if (S_ISCHR(inode->i_mode) && inode->i_cdev)
cd_forget(inode);
inode->i_state = I_CLEAR;
}
--
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 ` Theodore Ts'o [this message]
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 ` [patch 7/8] inode-diet: Use a union for i_blocks and i_size, i_rdev and i_devices Theodore Ts'o
2006-07-03 8:27 ` 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=20060703010022.784625000@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