diff options
Diffstat (limited to 'fs/binfmt_misc.c')
-rw-r--r-- | fs/binfmt_misc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 34ebbc191e46..66ba137f8661 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c | |||
@@ -507,7 +507,6 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode) | |||
507 | inode->i_mode = mode; | 507 | inode->i_mode = mode; |
508 | inode->i_uid = 0; | 508 | inode->i_uid = 0; |
509 | inode->i_gid = 0; | 509 | inode->i_gid = 0; |
510 | inode->i_blksize = PAGE_CACHE_SIZE; | ||
511 | inode->i_blocks = 0; | 510 | inode->i_blocks = 0; |
512 | inode->i_atime = inode->i_mtime = inode->i_ctime = | 511 | inode->i_atime = inode->i_mtime = inode->i_ctime = |
513 | current_fs_time(inode->i_sb); | 512 | current_fs_time(inode->i_sb); |
@@ -517,7 +516,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode) | |||
517 | 516 | ||
518 | static void bm_clear_inode(struct inode *inode) | 517 | static void bm_clear_inode(struct inode *inode) |
519 | { | 518 | { |
520 | kfree(inode->u.generic_ip); | 519 | kfree(inode->i_private); |
521 | } | 520 | } |
522 | 521 | ||
523 | static void kill_node(Node *e) | 522 | static void kill_node(Node *e) |
@@ -545,7 +544,7 @@ static void kill_node(Node *e) | |||
545 | static ssize_t | 544 | static ssize_t |
546 | bm_entry_read(struct file * file, char __user * buf, size_t nbytes, loff_t *ppos) | 545 | bm_entry_read(struct file * file, char __user * buf, size_t nbytes, loff_t *ppos) |
547 | { | 546 | { |
548 | Node *e = file->f_dentry->d_inode->u.generic_ip; | 547 | Node *e = file->f_dentry->d_inode->i_private; |
549 | loff_t pos = *ppos; | 548 | loff_t pos = *ppos; |
550 | ssize_t res; | 549 | ssize_t res; |
551 | char *page; | 550 | char *page; |
@@ -579,7 +578,7 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer, | |||
579 | size_t count, loff_t *ppos) | 578 | size_t count, loff_t *ppos) |
580 | { | 579 | { |
581 | struct dentry *root; | 580 | struct dentry *root; |
582 | Node *e = file->f_dentry->d_inode->u.generic_ip; | 581 | Node *e = file->f_dentry->d_inode->i_private; |
583 | int res = parse_command(buffer, count); | 582 | int res = parse_command(buffer, count); |
584 | 583 | ||
585 | switch (res) { | 584 | switch (res) { |
@@ -646,7 +645,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer, | |||
646 | } | 645 | } |
647 | 646 | ||
648 | e->dentry = dget(dentry); | 647 | e->dentry = dget(dentry); |
649 | inode->u.generic_ip = e; | 648 | inode->i_private = e; |
650 | inode->i_fop = &bm_entry_operations; | 649 | inode->i_fop = &bm_entry_operations; |
651 | 650 | ||
652 | d_instantiate(dentry, inode); | 651 | d_instantiate(dentry, inode); |