Commit 8e18e294 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Linus Torvalds

[PATCH] inode_diet: Replace inode.u.generic_ip with inode.i_private

The following patches reduce the size of the VFS inode structure by 28 bytes
on a UP x86.  (It would be more on an x86_64 system).  This is a 10% reduction
in the inode size on a UP kernel that is configured in a production mode
(i.e., with no spinlock or other debugging functions enabled; if you want to
save memory taken up by in-core inodes, the first thing you should do is
disable the debugging options; they are responsible for a huge amount of bloat
in the VFS inode structure).

This patch:

The filesystem or device-specific pointer in the inode is inside a union,
which is pretty pointless given that all 30+ users of this field have been
using the void pointer.  Get rid of the union and rename it to i_private, with
a comment to explain who is allowed to use the void pointer.  This is just a
cleanup, but it allows us to reuse the union 'u' for something something where
the union will actually be used.

[judith@osdl.org: powerpc build fix]
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: default avatarJudith Lebzelter <judith@osdl.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6a1d9805
...@@ -120,7 +120,7 @@ spufs_new_file(struct super_block *sb, struct dentry *dentry, ...@@ -120,7 +120,7 @@ spufs_new_file(struct super_block *sb, struct dentry *dentry,
ret = 0; ret = 0;
inode->i_op = &spufs_file_iops; inode->i_op = &spufs_file_iops;
inode->i_fop = fops; inode->i_fop = fops;
inode->u.generic_ip = SPUFS_I(inode)->i_ctx = get_spu_context(ctx); inode->i_private = SPUFS_I(inode)->i_ctx = get_spu_context(ctx);
d_add(dentry, inode); d_add(dentry, inode);
out: out:
return ret; return ret;
......
...@@ -85,7 +85,7 @@ static int hcall_inst_seq_open(struct inode *inode, struct file *file) ...@@ -85,7 +85,7 @@ static int hcall_inst_seq_open(struct inode *inode, struct file *file)
rc = seq_open(file, &hcall_inst_seq_ops); rc = seq_open(file, &hcall_inst_seq_ops);
seq = file->private_data; seq = file->private_data;
seq->private = file->f_dentry->d_inode->u.generic_ip; seq->private = file->f_dentry->d_inode->i_private;
return rc; return rc;
} }
......
...@@ -104,13 +104,13 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode) ...@@ -104,13 +104,13 @@ static struct inode *hypfs_make_inode(struct super_block *sb, int mode)
static void hypfs_drop_inode(struct inode *inode) static void hypfs_drop_inode(struct inode *inode)
{ {
kfree(inode->u.generic_ip); kfree(inode->i_private);
generic_delete_inode(inode); generic_delete_inode(inode);
} }
static int hypfs_open(struct inode *inode, struct file *filp) static int hypfs_open(struct inode *inode, struct file *filp)
{ {
char *data = filp->f_dentry->d_inode->u.generic_ip; char *data = filp->f_dentry->d_inode->i_private;
struct hypfs_sb_info *fs_info; struct hypfs_sb_info *fs_info;
if (filp->f_mode & FMODE_WRITE) { if (filp->f_mode & FMODE_WRITE) {
...@@ -352,7 +352,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb, ...@@ -352,7 +352,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb,
parent->d_inode->i_nlink++; parent->d_inode->i_nlink++;
} else } else
BUG(); BUG();
inode->u.generic_ip = data; inode->i_private = data;
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
dget(dentry); dget(dentry);
return dentry; return dentry;
......
...@@ -603,7 +603,7 @@ debug_open(struct inode *inode, struct file *file) ...@@ -603,7 +603,7 @@ debug_open(struct inode *inode, struct file *file)
debug_info_t *debug_info, *debug_info_snapshot; debug_info_t *debug_info, *debug_info_snapshot;
down(&debug_lock); down(&debug_lock);
debug_info = (struct debug_info*)file->f_dentry->d_inode->u.generic_ip; debug_info = file->f_dentry->d_inode->i_private;
/* find debug view */ /* find debug view */
for (i = 0; i < DEBUG_MAX_VIEWS; i++) { for (i = 0; i < DEBUG_MAX_VIEWS; i++) {
if (!debug_info->views[i]) if (!debug_info->views[i])
......
...@@ -217,7 +217,7 @@ static int blk_trace_remove(request_queue_t *q) ...@@ -217,7 +217,7 @@ static int blk_trace_remove(request_queue_t *q)
static int blk_dropped_open(struct inode *inode, struct file *filp) static int blk_dropped_open(struct inode *inode, struct file *filp)
{ {
filp->private_data = inode->u.generic_ip; filp->private_data = inode->i_private;
return 0; return 0;
} }
......
...@@ -305,7 +305,7 @@ static int dbg_show(struct seq_file *s, void *_) ...@@ -305,7 +305,7 @@ static int dbg_show(struct seq_file *s, void *_)
static int dbg_tps_open(struct inode *inode, struct file *file) static int dbg_tps_open(struct inode *inode, struct file *file)
{ {
return single_open(file, dbg_show, inode->u.generic_ip); return single_open(file, dbg_show, inode->i_private);
} }
static struct file_operations debug_fops = { static struct file_operations debug_fops = {
......
...@@ -64,7 +64,7 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry, ...@@ -64,7 +64,7 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
inode->i_blksize = PAGE_CACHE_SIZE; inode->i_blksize = PAGE_CACHE_SIZE;
inode->i_blocks = 0; inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
inode->u.generic_ip = data; inode->i_private = data;
if ((mode & S_IFMT) == S_IFDIR) { if ((mode & S_IFMT) == S_IFDIR) {
inode->i_op = &simple_dir_inode_operations; inode->i_op = &simple_dir_inode_operations;
inode->i_nlink++; inode->i_nlink++;
...@@ -119,7 +119,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf, ...@@ -119,7 +119,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
u16 i; u16 i;
struct ipath_devdata *dd; struct ipath_devdata *dd;
dd = file->f_dentry->d_inode->u.generic_ip; dd = file->f_dentry->d_inode->i_private;
for (i = 0; i < NUM_COUNTERS; i++) for (i = 0; i < NUM_COUNTERS; i++)
counters[i] = ipath_snap_cntr(dd, i); counters[i] = ipath_snap_cntr(dd, i);
...@@ -139,7 +139,7 @@ static ssize_t atomic_node_info_read(struct file *file, char __user *buf, ...@@ -139,7 +139,7 @@ static ssize_t atomic_node_info_read(struct file *file, char __user *buf,
struct ipath_devdata *dd; struct ipath_devdata *dd;
u64 guid; u64 guid;
dd = file->f_dentry->d_inode->u.generic_ip; dd = file->f_dentry->d_inode->i_private;
guid = be64_to_cpu(dd->ipath_guid); guid = be64_to_cpu(dd->ipath_guid);
...@@ -178,7 +178,7 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf, ...@@ -178,7 +178,7 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
u32 tmp, tmp2; u32 tmp, tmp2;
struct ipath_devdata *dd; struct ipath_devdata *dd;
dd = file->f_dentry->d_inode->u.generic_ip; dd = file->f_dentry->d_inode->i_private;
/* so we only initialize non-zero fields. */ /* so we only initialize non-zero fields. */
memset(portinfo, 0, sizeof portinfo); memset(portinfo, 0, sizeof portinfo);
...@@ -325,7 +325,7 @@ static ssize_t flash_read(struct file *file, char __user *buf, ...@@ -325,7 +325,7 @@ static ssize_t flash_read(struct file *file, char __user *buf,
goto bail; goto bail;
} }
dd = file->f_dentry->d_inode->u.generic_ip; dd = file->f_dentry->d_inode->i_private;
if (ipath_eeprom_read(dd, pos, tmp, count)) { if (ipath_eeprom_read(dd, pos, tmp, count)) {
ipath_dev_err(dd, "failed to read from flash\n"); ipath_dev_err(dd, "failed to read from flash\n");
ret = -ENXIO; ret = -ENXIO;
...@@ -381,7 +381,7 @@ static ssize_t flash_write(struct file *file, const char __user *buf, ...@@ -381,7 +381,7 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
goto bail_tmp; goto bail_tmp;
} }
dd = file->f_dentry->d_inode->u.generic_ip; dd = file->f_dentry->d_inode->i_private;
if (ipath_eeprom_write(dd, pos, tmp, count)) { if (ipath_eeprom_write(dd, pos, tmp, count)) {
ret = -ENXIO; ret = -ENXIO;
ipath_dev_err(dd, "failed to write to flash\n"); ipath_dev_err(dd, "failed to write to flash\n");
......
...@@ -141,7 +141,7 @@ static int ipoib_mcg_open(struct inode *inode, struct file *file) ...@@ -141,7 +141,7 @@ static int ipoib_mcg_open(struct inode *inode, struct file *file)
return ret; return ret;
seq = file->private_data; seq = file->private_data;
seq->private = inode->u.generic_ip; seq->private = inode->i_private;
return 0; return 0;
} }
...@@ -247,7 +247,7 @@ static int ipoib_path_open(struct inode *inode, struct file *file) ...@@ -247,7 +247,7 @@ static int ipoib_path_open(struct inode *inode, struct file *file)
return ret; return ret;
seq = file->private_data; seq = file->private_data;
seq->private = inode->u.generic_ip; seq->private = inode->i_private;
return 0; return 0;
} }
......
...@@ -175,7 +175,7 @@ static struct dentry *ibmasmfs_create_file (struct super_block *sb, ...@@ -175,7 +175,7 @@ static struct dentry *ibmasmfs_create_file (struct super_block *sb,
} }
inode->i_fop = fops; inode->i_fop = fops;
inode->u.generic_ip = data; inode->i_private = data;
d_add(dentry, inode); d_add(dentry, inode);
return dentry; return dentry;
...@@ -244,7 +244,7 @@ static int command_file_open(struct inode *inode, struct file *file) ...@@ -244,7 +244,7 @@ static int command_file_open(struct inode *inode, struct file *file)
{ {
struct ibmasmfs_command_data *command_data; struct ibmasmfs_command_data *command_data;
if (!inode->u.generic_ip) if (!inode->i_private)
return -ENODEV; return -ENODEV;
command_data = kmalloc(sizeof(struct ibmasmfs_command_data), GFP_KERNEL); command_data = kmalloc(sizeof(struct ibmasmfs_command_data), GFP_KERNEL);
...@@ -252,7 +252,7 @@ static int command_file_open(struct inode *inode, struct file *file) ...@@ -252,7 +252,7 @@ static int command_file_open(struct inode *inode, struct file *file)
return -ENOMEM; return -ENOMEM;
command_data->command = NULL; command_data->command = NULL;
command_data->sp = inode->u.generic_ip; command_data->sp = inode->i_private;
file->private_data = command_data; file->private_data = command_data;
return 0; return 0;
} }
...@@ -351,10 +351,10 @@ static int event_file_open(struct inode *inode, struct file *file) ...@@ -351,10 +351,10 @@ static int event_file_open(struct inode *inode, struct file *file)
struct ibmasmfs_event_data *event_data; struct ibmasmfs_event_data *event_data;
struct service_processor *sp; struct service_processor *sp;
if (!inode->u.generic_ip) if (!inode->i_private)
return -ENODEV; return -ENODEV;
sp = inode->u.generic_ip; sp = inode->i_private;
event_data = kmalloc(sizeof(struct ibmasmfs_event_data), GFP_KERNEL); event_data = kmalloc(sizeof(struct ibmasmfs_event_data), GFP_KERNEL);
if (!event_data) if (!event_data)
...@@ -439,14 +439,14 @@ static int r_heartbeat_file_open(struct inode *inode, struct file *file) ...@@ -439,14 +439,14 @@ static int r_heartbeat_file_open(struct inode *inode, struct file *file)
{ {
struct ibmasmfs_heartbeat_data *rhbeat; struct ibmasmfs_heartbeat_data *rhbeat;
if (!inode->u.generic_ip) if (!inode->i_private)
return -ENODEV; return -ENODEV;
rhbeat = kmalloc(sizeof(struct ibmasmfs_heartbeat_data), GFP_KERNEL); rhbeat = kmalloc(sizeof(struct ibmasmfs_heartbeat_data), GFP_KERNEL);
if (!rhbeat) if (!rhbeat)
return -ENOMEM; return -ENOMEM;
rhbeat->sp = (struct service_processor *)inode->u.generic_ip; rhbeat->sp = inode->i_private;
rhbeat->active = 0; rhbeat->active = 0;
ibmasm_init_reverse_heartbeat(rhbeat->sp, &rhbeat->heartbeat); ibmasm_init_reverse_heartbeat(rhbeat->sp, &rhbeat->heartbeat);
file->private_data = rhbeat; file->private_data = rhbeat;
...@@ -508,7 +508,7 @@ static ssize_t r_heartbeat_file_write(struct file *file, const char __user *buf, ...@@ -508,7 +508,7 @@ static ssize_t r_heartbeat_file_write(struct file *file, const char __user *buf,
static int remote_settings_file_open(struct inode *inode, struct file *file) static int remote_settings_file_open(struct inode *inode, struct file *file)
{ {
file->private_data = inode->u.generic_ip; file->private_data = inode->i_private;
return 0; return 0;
} }
......
...@@ -58,7 +58,7 @@ typedef void irqreturn_t; ...@@ -58,7 +58,7 @@ typedef void irqreturn_t;
/* PDE() introduced in 2.5.4 */ /* PDE() introduced in 2.5.4 */
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
#define PDE(inode) ((inode)->u.generic_ip) #define PDE(inode) ((inode)->i_private)
#endif #endif
/* irda crc16 calculation exported in 2.5.42 */ /* irda crc16 calculation exported in 2.5.42 */
......
...@@ -54,7 +54,7 @@ static ssize_t write_file_dummy(struct file *file, const char __user *buf, ...@@ -54,7 +54,7 @@ static ssize_t write_file_dummy(struct file *file, const char __user *buf,
static int open_file_generic(struct inode *inode, struct file *file) static int open_file_generic(struct inode *inode, struct file *file)
{ {
file->private_data = inode->u.generic_ip; file->private_data = inode->i_private;
return 0; return 0;
} }
......
...@@ -110,8 +110,8 @@ static ssize_t ulong_write_file(struct file * file, char const __user * buf, siz ...@@ -110,8 +110,8 @@ static ssize_t ulong_write_file(struct file * file, char const __user * buf, siz
static int default_open(struct inode * inode, struct file * filp) static int default_open(struct inode * inode, struct file * filp)
{ {
if (inode->u.generic_ip) if (inode->i_private)
filp->private_data = inode->u.generic_ip; filp->private_data = inode->i_private;
return 0; return 0;
} }
...@@ -158,7 +158,7 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root, ...@@ -158,7 +158,7 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
if (!d) if (!d)
return -EFAULT; return -EFAULT;
d->d_inode->u.generic_ip = val; d->d_inode->i_private = val;
return 0; return 0;
} }
...@@ -171,7 +171,7 @@ int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, ...@@ -171,7 +171,7 @@ int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
if (!d) if (!d)
return -EFAULT; return -EFAULT;
d->d_inode->u.generic_ip = val; d->d_inode->i_private = val;
return 0; return 0;
} }
...@@ -197,7 +197,7 @@ int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root, ...@@ -197,7 +197,7 @@ int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
if (!d) if (!d)
return -EFAULT; return -EFAULT;
d->d_inode->u.generic_ip = val; d->d_inode->i_private = val;
return 0; return 0;
} }
......
...@@ -140,7 +140,7 @@ struct ctrl_dbg { ...@@ -140,7 +140,7 @@ struct ctrl_dbg {
static int open(struct inode *inode, struct file *file) static int open(struct inode *inode, struct file *file)
{ {
struct controller *ctrl = inode->u.generic_ip; struct controller *ctrl = inode->i_private;
struct ctrl_dbg *dbg; struct ctrl_dbg *dbg;
int retval = -ENOMEM; int retval = -ENOMEM;
......
...@@ -555,7 +555,7 @@ static int usbdev_open(struct inode *inode, struct file *file) ...@@ -555,7 +555,7 @@ static int usbdev_open(struct inode *inode, struct file *file)
if (imajor(inode) == USB_DEVICE_MAJOR) if (imajor(inode) == USB_DEVICE_MAJOR)
dev = usbdev_lookup_minor(iminor(inode)); dev = usbdev_lookup_minor(iminor(inode));
if (!dev) if (!dev)
dev = inode->u.generic_ip; dev = inode->i_private;
if (!dev) { if (!dev) {
kfree(ps); kfree(ps);
goto out; goto out;
......
...@@ -402,8 +402,8 @@ static loff_t default_file_lseek (struct file *file, loff_t offset, int orig) ...@@ -402,8 +402,8 @@ static loff_t default_file_lseek (struct file *file, loff_t offset, int orig)
static int default_open (struct inode *inode, struct file *file) static int default_open (struct inode *inode, struct file *file)
{ {
if (inode->u.generic_ip) if (inode->i_private)
file->private_data = inode->u.generic_ip; file->private_data = inode->i_private;
return 0; return 0;
} }
...@@ -509,7 +509,7 @@ static struct dentry *fs_create_file (const char *name, mode_t mode, ...@@ -509,7 +509,7 @@ static struct dentry *fs_create_file (const char *name, mode_t mode,
} else { } else {
if (dentry->d_inode) { if (dentry->d_inode) {
if (data) if (data)
dentry->d_inode->u.generic_ip = data; dentry->d_inode->i_private = data;
if (fops) if (fops)
dentry->d_inode->i_fop = fops; dentry->d_inode->i_fop = fops;
dentry->d_inode->i_uid = uid; dentry->d_inode->i_uid = uid;
......
...@@ -844,7 +844,7 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) ...@@ -844,7 +844,7 @@ ep_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
static int static int
ep_open (struct inode *inode, struct file *fd) ep_open (struct inode *inode, struct file *fd)
{ {
struct ep_data *data = inode->u.generic_ip; struct ep_data *data = inode->i_private;
int value = -EBUSY; int value = -EBUSY;
if (down_interruptible (&data->lock) != 0) if (down_interruptible (&data->lock) != 0)
...@@ -1909,7 +1909,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) ...@@ -1909,7 +1909,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr)
static int static int
dev_open (struct inode *inode, struct file *fd) dev_open (struct inode *inode, struct file *fd)
{ {
struct dev_data *dev = inode->u.generic_ip; struct dev_data *dev = inode->i_private;
int value = -EBUSY; int value = -EBUSY;
if (dev->state == STATE_DEV_DISABLED) { if (dev->state == STATE_DEV_DISABLED) {
...@@ -1970,7 +1970,7 @@ gadgetfs_make_inode (struct super_block *sb, ...@@ -1970,7 +1970,7 @@ gadgetfs_make_inode (struct super_block *sb,
inode->i_blocks = 0; inode->i_blocks = 0;
inode->i_atime = inode->i_mtime = inode->i_ctime inode->i_atime = inode->i_mtime = inode->i_ctime
= CURRENT_TIME; = CURRENT_TIME;
inode->u.generic_ip = data; inode->i_private = data;
inode->i_fop = fops; inode->i_fop = fops;
} }
return inode; return inode;
......
...@@ -1204,7 +1204,7 @@ static int isp116x_show_dbg(struct seq_file *s, void *unused) ...@@ -1204,7 +1204,7 @@ static int isp116x_show_dbg(struct seq_file *s, void *unused)
static int isp116x_open_seq(struct inode *inode, struct file *file) static int isp116x_open_seq(struct inode *inode, struct file *file)
{ {
return single_open(file, isp116x_show_dbg, inode->u.generic_ip); return single_open(file, isp116x_show_dbg, inode->i_private);
} }
static struct file_operations isp116x_debug_fops = { static struct file_operations isp116x_debug_fops = {
......
...@@ -428,7 +428,7 @@ struct uhci_debug { ...@@ -428,7 +428,7 @@ struct uhci_debug {
static int uhci_debug_open(struct inode *inode, struct file *file) static int uhci_debug_open(struct inode *inode, struct file *file)
{ {
struct uhci_hcd *uhci = inode->u.generic_ip; struct uhci_hcd *uhci = inode->i_private;
struct uhci_debug *up; struct uhci_debug *up;
int ret = -ENOMEM; int ret = -ENOMEM;
unsigned long flags; unsigned long flags;
......
...@@ -28,7 +28,7 @@ static int mon_stat_open(struct inode *inode, struct file *file) ...@@ -28,7 +28,7 @@ static int mon_stat_open(struct inode *inode, struct file *file)
if ((sp = kmalloc(sizeof(struct snap), GFP_KERNEL)) == NULL) if ((sp = kmalloc(sizeof(struct snap), GFP_KERNEL)) == NULL)
return -ENOMEM; return -ENOMEM;
mbus = inode->u.generic_ip; mbus = inode->i_private;
sp->slen = snprintf(sp->str, STAT_BUF_SIZE, sp->slen = snprintf(sp->str, STAT_BUF_SIZE,
"nreaders %d events %u text_lost %u\n", "nreaders %d events %u text_lost %u\n",
......
...@@ -238,7 +238,7 @@ static int mon_text_open(struct inode *inode, struct file *file) ...@@ -238,7 +238,7 @@ static int mon_text_open(struct inode *inode, struct file *file)
int rc; int rc;
mutex_lock(&mon_lock); mutex_lock(&mon_lock);
mbus = inode->u.generic_ip; mbus = inode->i_private;
ubus = mbus->u_bus; ubus = mbus->u_bus;
rp = kzalloc(sizeof(struct mon_reader_text), GFP_KERNEL); rp = kzalloc(sizeof(struct mon_reader_text), GFP_KERNEL);
...@@ -401,7 +401,7 @@ static int mon_text_release(struct inode *inode, struct file *file) ...@@ -401,7 +401,7 @@ static int mon_text_release(struct inode *inode, struct file *file)
struct mon_event_text *ep; struct mon_event_text *ep;
mutex_lock(&mon_lock); mutex_lock(&mon_lock);
mbus = inode->u.generic_ip; mbus = inode->i_private;
if (mbus->nreaders <= 0) { if (mbus->nreaders <= 0) {
printk(KERN_ERR TAG ": consistency error on close\n"); printk(KERN_ERR TAG ": consistency error on close\n");
......
...@@ -241,7 +241,7 @@ static void autofs_read_inode(struct inode *inode) ...@@ -241,7 +241,7 @@ static void autofs_read_inode(struct inode *inode)
inode->i_op = &autofs_symlink_inode_operations; inode->i_op = &autofs_symlink_inode_operations;
sl = &sbi->symlink[n]; sl = &sbi->symlink[n];
inode->u.generic_ip = sl; inode->i_private = sl;
inode->i_mode = S_IFLNK | S_IRWXUGO; inode->i_mode = S_IFLNK | S_IRWXUGO;
inode->i_mtime.tv_sec = inode->i_ctime.tv_sec = sl->mtime; inode->i_mtime.tv_sec = inode->i_ctime.tv_sec = sl->mtime;
inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = 0; inode->i_mtime.tv_nsec = inode->i_ctime.tv_nsec = 0;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
/* Nothing to release.. */ /* Nothing to release.. */
static void *autofs_follow_link(struct dentry *dentry, struct nameidata *nd) static void *autofs_follow_link(struct dentry *dentry, struct nameidata *nd)
{ {
char *s=((struct autofs_symlink *)dentry->d_inode->u.generic_ip)->data; char *s=((struct autofs_symlink *)dentry->d_inode->i_private)->data;
nd_set_link(nd, s); nd_set_link(nd, s);
return NULL; return NULL;
} }
......
...@@ -517,7 +517,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode) ...@@ -517,7 +517,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode)
static void bm_clear_inode(struct inode *inode) static void bm_clear_inode(struct inode *inode)
{ {
kfree(inode->u.generic_ip); kfree(inode->i_private);
} }
static void kill_node(Node *e) static void kill_node(Node *e)
...@@ -545,7 +545,7 @@ static void kill_node(Node *e) ...@@ -545,7 +545,7 @@ static void kill_node(Node *e)
static ssize_t static ssize_t
bm_entry_read(struct file * file, char __user * buf, size_t nbytes, loff_t *ppos) bm_entry_read(struct file * file, char __user * buf, size_t nbytes, loff_t *ppos)
{ {
Node *e = file->f_dentry->d_inode->u.generic_ip; Node *e = file->f_dentry->d_inode->i_private;
loff_t pos = *ppos; loff_t pos = *ppos;
ssize_t res; ssize_t res;
char *page; char *page;
...@@ -579,7 +579,7 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer, ...@@ -579,7 +579,7 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct dentry *root; struct dentry *root;
Node *e = file->f_dentry->d_inode->u.generic_ip; Node *e = file->f_dentry->d_inode->i_private;
int res = parse_command(buffer, count); int res = parse_command(buffer, count);
switch (res) { switch (res) {
...@@ -646,7 +646,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer, ...@@ -646,7 +646,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer,
} }
e->dentry = dget(dentry); e->dentry = dget(dentry);
inode->u.generic_ip = e; inode->i_private = e;
inode->i_fop = &bm_entry_operations; inode->i_fop = &bm_entry_operations;
d_instantiate(dentry, inode); d_instantiate(dentry, inode);
......
...@@ -32,8 +32,8 @@ static ssize_t default_write_file(struct file *file, const char __user *buf, ...@@ -32,8 +32,8 @@ static ssize_t default_write_file(struct file *file, const char __user *buf,
static int default_open(struct inode *inode, struct file *file) static int default_open(struct inode *inode, struct file *file)
{ {
if (inode->u.generic_ip) if (inode->i_private)
file->private_data = inode->u.generic_ip; file->private_data = inode->i_private;
return 0; return 0;
} }
......
...@@ -168,7 +168,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode, ...@@ -168,7 +168,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode,
* directory dentry if set. If this paramater is NULL, then the * directory dentry if set. If this paramater is NULL, then the
* file will be created in the root of the debugfs filesystem. * file will be created in the root of the debugfs filesystem.
* @data: a pointer to something that the caller will want to get to later * @data: a pointer to something that the caller will want to get to later
* on. The inode.u.generic_ip pointer will point to this value on * on. The inode.i_private pointer will point to this value on
* the open() call. * the open() call.
* @fops: a pointer to a struct file_operations that should be used for * @fops: a pointer to a struct file_operations that should be used for
* this file. * this file.
...@@ -209,7 +209,7 @@ struct dentry *debugfs_create_file(const char *name, mode_t mode, ...@@ -209,7 +209,7 @@ struct dentry *debugfs_create_file(const char *name, mode_t mode,
if (dentry->d_inode) { if (dentry->d_inode) {
if (data) if (data)
dentry->d_inode->u.generic_ip = data; dentry->d_inode->i_private = data;
if (fops) if (fops)
dentry->d_inode->i_fop = fops; dentry->d_inode->i_fop = fops;
} }
......
...@@ -177,7 +177,7 @@ int devpts_pty_new(struct tty_struct *tty) ...@@ -177,7 +177,7 @@ int devpts_pty_new(struct tty_struct *tty)
inode->i_gid = config.setgid ? config.gid : current->fsgid; inode->i_gid = config.setgid ? config.gid : current->fsgid;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
init_special_inode(inode, S_IFCHR|config.mode, device); init_special_inode(inode, S_IFCHR|config.mode, device);
inode->u.generic_ip = tty; inode->i_private = tty;
dentry = get_node(number); dentry = get_node(number);
if (!IS_ERR(dentry) && !dentry->d_inode) if (!IS_ERR(dentry) && !dentry->d_inode)
...@@ -196,7 +196,7 @@ struct tty_struct *devpts_get_tty(int number) ...@@ -196,7 +196,7 @@ struct tty_struct *devpts_get_tty(int number)
tty = NULL; tty = NULL;
if (!IS_ERR(dentry)) { if (!IS_ERR(dentry)) {
if (dentry->d_inode) if (dentry->d_inode)
tty = dentry->d_inode->u.generic_ip; tty = dentry->d_inode->i_private;
dput(dentry); dput(dentry);
} }
......
...@@ -252,7 +252,7 @@ enum { ...@@ -252,7 +252,7 @@ enum {
* Get filesystem private data from VFS inode. * Get filesystem private data from VFS inode.
*/ */
#define VXFS_INO(ip) \ #define VXFS_INO(ip) \
((struct vxfs_inode_info *)(ip)->u.generic_ip) ((struct vxfs_inode_info *)(ip)->i_private)
/* /*
* Get filesystem private data from VFS superblock. * Get filesystem private data from VFS superblock.
......
...@@ -243,7 +243,7 @@ vxfs_iinit(struct inode *ip, struct vxfs_inode_info *vip) ...@@ -243,7 +243,7 @@ vxfs_iinit(struct inode *ip, struct vxfs_inode_info *vip)
ip->i_blocks = vip->vii_blocks; ip->i_blocks = vip->vii_blocks;
ip->i_generation = vip->vii_gen; ip->i_generation = vip->vii_gen;
ip->u.generic_ip = (void *)vip; ip->i_private = vip;
} }
...@@ -338,5 +338,5 @@ vxfs_read_inode(struct inode *ip) ...@@ -338,5 +338,5 @@ vxfs_read_inode(struct inode *ip)
void void
vxfs_clear_inode(struct inode *ip) vxfs_clear_inode(struct inode *ip)
{ {
kmem_cache_free(vxfs_inode_cachep, ip->u.generic_ip); kmem_cache_free(vxfs_inode_cachep, ip->i_private);
} }
...@@ -23,7 +23,7 @@ static struct fuse_conn *fuse_ctl_file_conn_get(struct file *file) ...@@ -23,7 +23,7 @@ static struct fuse_conn *fuse_ctl_file_conn_get(struct file *file)
{ {
struct fuse_conn *fc; struct fuse_conn *fc;
mutex_lock(&fuse_mutex); mutex_lock(&fuse_mutex);
fc = file->f_dentry->d_inode->u.generic_ip; fc = file->f_dentry->d_inode->i_private;
if (fc) if (fc)
fc = fuse_conn_get(fc); fc = fuse_conn_get(fc);
mutex_unlock(&fuse_mutex); mutex_unlock(&fuse_mutex);
...@@ -98,7 +98,7 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent, ...@@ -98,7 +98,7 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent,
inode->i_op = iop; inode->i_op = iop;
inode->i_fop = fop; inode->i_fop = fop;
inode->i_nlink = nlink; inode->i_nlink = nlink;
inode->u.generic_ip = fc; inode->i_private = fc;
d_add(dentry, inode); d_add(dentry, inode);
return dentry; return dentry;
} }
...@@ -150,7 +150,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc) ...@@ -150,7 +150,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc)
for (i = fc->ctl_ndents - 1; i >= 0; i--) { for (i = fc->ctl_ndents - 1; i >= 0; i--) {
struct dentry *dentry = fc->ctl_dentry[i]; struct dentry *dentry = fc->ctl_dentry[i];
dentry->d_inode->u.generic_ip = NULL; dentry->d_inode->i_private = NULL;
d_drop(dentry); d_drop(dentry);
dput(dentry); dput(dentry);
} }
......
...@@ -163,7 +163,7 @@ static struct inode *alloc_inode(struct super_block *sb) ...@@ -163,7 +163,7 @@ static struct inode *alloc_inode(struct super_block *sb)
bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info; bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info;
mapping->backing_dev_info = bdi; mapping->backing_dev_info = bdi;
} }
memset(&inode->u, 0, sizeof(inode->u)); inode->i_private = 0;
inode->i_mapping = mapping; inode->i_mapping = mapping;
} }
return inode; return inode;
......
...@@ -369,7 +369,7 @@ jffs_new_inode(const struct inode * dir, struct jffs_raw_inode *raw_inode, ...@@ -369,7 +369,7 @@ jffs_new_inode(const struct inode * dir, struct jffs_raw_inode *raw_inode,
f = jffs_find_file(c, raw_inode->ino); f = jffs_find_file(c, raw_inode->ino);
inode->u.generic_ip = (void *)f; inode->i_private = (void *)f;
insert_inode_hash(inode); insert_inode_hash(inode);
return inode; return inode;
...@@ -442,7 +442,7 @@ jffs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -442,7 +442,7 @@ jffs_rename(struct inode *old_dir, struct dentry *old_dentry,
}); });
result = -ENOTDIR; result = -ENOTDIR;
if (!(old_dir_f = (struct jffs_file *)old_dir->u.generic_ip)) { if (!(old_dir_f = old_dir->i_private)) {
D(printk("jffs_rename(): Old dir invalid.\n")); D(printk("jffs_rename(): Old dir invalid.\n"));
goto jffs_rename_end; goto jffs_rename_end;
} }
...@@ -456,7 +456,7 @@ jffs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -456,7 +456,7 @@ jffs_rename(struct inode *old_dir, struct dentry *old_dentry,
/* Find the new directory. */ /* Find the new directory. */
result = -ENOTDIR; result = -ENOTDIR;
if (!(new_dir_f = (struct jffs_file *)new_dir->u.generic_ip)) { if (!(new_dir_f = new_dir->i_private)) {
D(printk("jffs_rename(): New dir invalid.\n")); D(printk("jffs_rename(): New dir invalid.\n"));
goto jffs_rename_end; goto jffs_rename_end;
} }
...@@ -593,7 +593,7 @@ jffs_readdir(struct file *filp, void *dirent, filldir_t filldir) ...@@ -593,7 +593,7 @@ jffs_readdir(struct file *filp, void *dirent, filldir_t filldir)
} }
else { else {
ddino = ((struct jffs_file *) ddino = ((struct jffs_file *)
inode->u.generic_ip)->pino; inode->i_private)->pino;
} }
D3(printk("jffs_readdir(): \"..\" %u\n", ddino)); D3(printk("jffs_readdir(): \"..\" %u\n", ddino));
if (filldir(dirent, "..", 2, filp->f_pos, ddino, DT_DIR) < 0) { if (filldir(dirent, "..", 2, filp->f_pos, ddino, DT_DIR) < 0) {
...@@ -604,7 +604,7 @@ jffs_readdir(struct file *filp, void *dirent, filldir_t filldir) ...@@ -604,7 +604,7 @@ jffs_readdir(struct file *filp, void *dirent, filldir_t filldir)
} }
filp->f_pos++; filp->f_pos++;
} }
f = ((struct jffs_file *)inode->u.generic_ip)->children; f = ((struct jffs_file *)inode->i_private)->children;
j = 2; j = 2;
while(f && (f->deleted || j++ < filp->f_pos )) { while(f && (f->deleted || j++ < filp->f_pos )) {
...@@ -668,7 +668,7 @@ jffs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) ...@@ -668,7 +668,7 @@ jffs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
} }
r = -EACCES; r = -EACCES;
if (!(d = (struct jffs_file *)dir->u.generic_ip)) { if (!(d = (struct jffs_file *)dir->i_private)) {
D(printk("jffs_lookup(): No such inode! (%lu)\n", D(printk("jffs_lookup(): No such inode! (%lu)\n",
dir->i_ino)); dir->i_ino));
goto jffs_lookup_end; goto jffs_lookup_end;
...@@ -739,7 +739,7 @@ jffs_do_readpage_nolock(struct file *file, struct page *page) ...@@ -739,7 +739,7 @@ jffs_do_readpage_nolock(struct file *file, struct page *page)
unsigned long read_len; unsigned long read_len;
int result; int result;
struct inode *inode = (struct inode*)page->mapping->host; struct inode *inode = (struct inode*)page->mapping->host;
struct jffs_file *f = (struct jffs_file *)inode->u.generic_ip; struct jffs_file *f = (struct jffs_file *)inode->i_private;
struct jffs_control *c = (struct jffs_control *)inode->i_sb->s_fs_info; struct jffs_control *c = (struct jffs_control *)inode->i_sb->s_fs_info;
int r; int r;
loff_t offset; loff_t offset;
...@@ -828,7 +828,7 @@ jffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ...@@ -828,7 +828,7 @@ jffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
}); });
lock_kernel(); lock_kernel();
dir_f = (struct jffs_file *)dir->u.generic_ip; dir_f = dir->i_private;
ASSERT(if (!dir_f) { ASSERT(if (!dir_f) {
printk(KERN_ERR "jffs_mkdir(): No reference to a " printk(KERN_ERR "jffs_mkdir(): No reference to a "
...@@ -972,7 +972,7 @@ jffs_remove(struct inode *dir, struct dentry *dentry, int type) ...@@ -972,7 +972,7 @@ jffs_remove(struct inode *dir, struct dentry *dentry, int type)
kfree(_name); kfree(_name);
}); });
dir_f = (struct jffs_file *) dir->u.generic_ip; dir_f = dir->i_private;
c = dir_f->c; c = dir_f->c;
result = -ENOENT; result = -ENOENT;
...@@ -1082,7 +1082,7 @@ jffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev) ...@@ -1082,7 +1082,7 @@ jffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
if (!old_valid_dev(rdev)) if (!old_valid_dev(rdev))
return -EINVAL; return -EINVAL;
lock_kernel(); lock_kernel();
dir_f = (struct jffs_file *)dir->u.generic_ip; dir_f = dir->i_private;
c = dir_f->c; c = dir_f->c;
D3(printk (KERN_NOTICE "mknod(): down biglock\n")); D3(printk (KERN_NOTICE "mknod(): down biglock\n"));
...@@ -1186,7 +1186,7 @@ jffs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) ...@@ -1186,7 +1186,7 @@ jffs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
kfree(_symname); kfree(_symname);
}); });
dir_f = (struct jffs_file *)dir->u.generic_ip; dir_f = dir->i_private;
ASSERT(if (!dir_f) { ASSERT(if (!dir_f) {
printk(KERN_ERR "jffs_symlink(): No reference to a " printk(KERN_ERR "jffs_symlink(): No reference to a "
"jffs_file struct in inode.\n"); "jffs_file struct in inode.\n");
...@@ -1289,7 +1289,7 @@ jffs_create(struct inode *dir, struct dentry *dentry, int mode, ...@@ -1289,7 +1289,7 @@ jffs_create(struct inode *dir, struct dentry *dentry, int mode,
kfree(s); kfree(s);
}); });
dir_f = (struct jffs_file *)dir->u.generic_ip; dir_f = dir->i_private;
ASSERT(if (!dir_f) { ASSERT(if (!dir_f) {
printk(KERN_ERR "jffs_create(): No reference to a " printk(KERN_ERR "jffs_create(): No reference to a "
"jffs_file struct in inode.\n"); "jffs_file struct in inode.\n");
...@@ -1403,9 +1403,9 @@ jffs_file_write(struct file *filp, const char *buf, size_t count, ...@@ -1403,9 +1403,9 @@ jffs_file_write(struct file *filp, const char *buf, size_t count,
goto out_isem; goto out_isem;
} }
if (!(f = (struct jffs_file *)inode->u.generic_ip)) { if (!(f = inode->i_private)) {
D(printk("jffs_file_write(): inode->u.generic_ip = 0x%p\n", D(printk("jffs_file_write(): inode->i_private = 0x%p\n",
inode->u.generic_ip)); inode->i_private));
goto out_isem; goto out_isem;
} }
...@@ -1693,7 +1693,7 @@ jffs_read_inode(struct inode *inode) ...@@ -1693,7 +1693,7 @@ jffs_read_inode(struct inode *inode)
mutex_unlock(&c->fmc->biglock); mutex_unlock(&c->fmc->biglock);
return; return;
} }
inode->u.generic_ip = (void *)f; inode->i_private = f;
inode->i_mode = f->mode; inode->i_mode = f->mode;
inode->i_nlink = f->nlink; inode->i_nlink = f->nlink;
inode->i_uid = f->uid; inode->i_uid = f->uid;
...@@ -1748,7 +1748,7 @@ jffs_delete_inode(struct inode *inode) ...@@ -1748,7 +1748,7 @@ jffs_delete_inode(struct inode *inode)
lock_kernel(); lock_kernel();
inode->i_size = 0; inode->i_size = 0;
inode->i_blocks = 0; inode->i_blocks = 0;
inode->u.generic_ip = NULL; inode->i_private = NULL;
clear_inode(inode); clear_inode(inode);
if (inode->i_nlink == 0) { if (inode->i_nlink == 0) {
c = (struct jffs_control *) inode->i_sb->s_fs_info; c = (struct jffs_control *) inode->i_sb->s_fs_info;
......
...@@ -547,7 +547,7 @@ int simple_attr_open(struct inode *inode, struct file *file, ...@@ -547,7 +547,7 @@ int simple_attr_open(struct inode *inode, struct file *file,
attr->get = get; attr->get = get;
attr->set = set; attr->set = set;
attr->data = inode->u.generic_ip; attr->data = inode->i_private;
attr->fmt = fmt; attr->fmt = fmt;
mutex_init(&attr->mutex); mutex_init(&attr->mutex);
......
...@@ -2052,7 +2052,7 @@ static int ocfs2_dlm_debug_open(struct inode *inode, struct file *file) ...@@ -2052,7 +2052,7 @@ static int ocfs2_dlm_debug_open(struct inode *inode, struct file *file)
mlog_errno(ret); mlog_errno(ret);
goto out; goto out;
} }
osb = (struct ocfs2_super *) inode->u.generic_ip; osb = inode->i_private;
ocfs2_get_dlm_debug(osb->osb_dlm_debug); ocfs2_get_dlm_debug(osb->osb_dlm_debug);
priv->p_dlm_debug = osb->osb_dlm_debug; priv->p_dlm_debug = osb->osb_dlm_debug;
INIT_LIST_HEAD(&priv->p_iter_res.l_debug_list); INIT_LIST_HEAD(&priv->p_iter_res.l_debug_list);
......
...@@ -554,9 +554,7 @@ struct inode { ...@@ -554,9 +554,7 @@ struct inode {
atomic_t i_writecount; atomic_t i_writecount;
void *i_security; void *i_security;
union { void *i_private; /* fs or device private pointer */
void *generic_ip;
} u;
#ifdef __NEED_I_SIZE_ORDERED #ifdef __NEED_I_SIZE_ORDERED
seqcount_t i_size_seqcount; seqcount_t i_size_seqcount;
#endif #endif
......
...@@ -669,7 +669,7 @@ EXPORT_SYMBOL_GPL(relay_flush); ...@@ -669,7 +669,7 @@ EXPORT_SYMBOL_GPL(relay_flush);
*/ */
static int relay_file_open(struct inode *inode, struct file *filp) static int relay_file_open(struct inode *inode, struct file *filp)
{ {
struct rchan_buf *buf = inode->u.generic_ip; struct rchan_buf *buf = inode->i_private;
kref_get(&buf->kref); kref_get(&buf->kref);
filp->private_data = buf; filp->private_data = buf;
......
...@@ -44,8 +44,8 @@ static ssize_t default_write_file(struct file *file, const char __user *buf, ...@@ -44,8 +44,8 @@ static ssize_t default_write_file(struct file *file, const char __user *buf,
static int default_open(struct inode *inode, struct file *file) static int default_open(struct inode *inode, struct file *file)
{ {
if (inode->u.generic_ip) if (inode->i_private)
file->private_data = inode->u.generic_ip; file->private_data = inode->i_private;
return 0; return 0;
} }
...@@ -194,7 +194,7 @@ static int create_by_name(const char *name, mode_t mode, ...@@ -194,7 +194,7 @@ static int create_by_name(const char *name, mode_t mode,
* directory dentry if set. If this paramater is NULL, then the * directory dentry if set. If this paramater is NULL, then the
* file will be created in the root of the securityfs filesystem. * file will be created in the root of the securityfs filesystem.
* @data: a pointer to something that the caller will want to get to later * @data: a pointer to something that the caller will want to get to later
* on. The inode.u.generic_ip pointer will point to this value on * on. The inode.i_private pointer will point to this value on
* the open() call. * the open() call.
* @fops: a pointer to a struct file_operations that should be used for * @fops: a pointer to a struct file_operations that should be used for
* this file. * this file.
...@@ -240,7 +240,7 @@ struct dentry *securityfs_create_file(const char *name, mode_t mode, ...@@ -240,7 +240,7 @@ struct dentry *securityfs_create_file(const char *name, mode_t mode,
if (fops) if (fops)
dentry->d_inode->i_fop = fops; dentry->d_inode->i_fop = fops;
if (data) if (data)
dentry->d_inode->u.generic_ip = data; dentry->d_inode->i_private = data;
} }
exit: exit:
return dentry; return dentry;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment