The patch titled
inode-diet: Move i_cdev into a union
has been added to the -mm tree. Its filename is
inode-diet-move-i_cdev-into-a-union.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: inode-diet: Move i_cdev into a union
From: "Theodore Ts'o" <tytso@xxxxxxx>
Move the i_cdev pointer in struct inode into a union.
Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/file_table.c | 2 +-
fs/inode.c | 2 +-
include/linux/fs.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/file_table.c~inode-diet-move-i_cdev-into-a-union fs/file_table.c
--- a/fs/file_table.c~inode-diet-move-i_cdev-into-a-union
+++ a/fs/file_table.c
@@ -169,7 +169,7 @@ void fastcall __fput(struct file *file)
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)
diff -puN fs/inode.c~inode-diet-move-i_cdev-into-a-union fs/inode.c
--- a/fs/inode.c~inode-diet-move-i_cdev-into-a-union
+++ a/fs/inode.c
@@ -256,7 +256,7 @@ void clear_inode(struct inode *inode)
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;
}
diff -puN include/linux/fs.h~inode-diet-move-i_cdev-into-a-union include/linux/fs.h
--- a/include/linux/fs.h~inode-diet-move-i_cdev-into-a-union
+++ a/include/linux/fs.h
@@ -527,8 +527,8 @@ struct inode {
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;
_
Patches currently in -mm which might be from tytso@xxxxxxx are
origin.patch
uml-build-fix.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch
inode-diet-move-i_pipe-into-a-union.patch
inode-diet-move-i_bdev-into-a-union.patch
inode-diet-move-i_cdev-into-a-union.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch
inode-diet-move-i_cindex-from-struct-inode-to-struct-file.patch
inode-diet-use-a-union-for-i_blocks-and-i_size-i_rdev-and-i_devices.patch
inode-diet-fix-size-of-i_blkbits-i_version-and-i_dnotify_mask.patch
inode-diet-move-i_pipe-into-a-union-ecryptfs.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-ecryptfs.patch
inode_diet-replace-inodeugeneric_ip-with-inodei_private-reiser4.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-reiser4.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
