diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-16 17:39:15 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-18 01:21:28 -0500 |
commit | 0bf71d4d005176f6b6587ba64a377f9798213f21 (patch) | |
tree | 4814d73e0201e92e7aca19b0a45f64b9a9644698 /fs/autofs4/root.c | |
parent | 09f12c03fa699ce7d030c47add60577138927d4f (diff) |
autofs4: kill ->size in autofs_info
It's used only to pass the length of symlink body to
autofs4_get_inode() in autofs4_dir_symlink(). We can
bloody well set inode->i_size in autofs4_dir_symlink()
directly and be done with that.
Acked-by: Ian Kent <raven@themaw.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4/root.c')
-rw-r--r-- | fs/autofs4/root.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index e55dcdbeb450..1ad3c6ca9b03 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
@@ -530,6 +530,7 @@ static int autofs4_dir_symlink(struct inode *dir, | |||
530 | struct autofs_info *ino = autofs4_dentry_ino(dentry); | 530 | struct autofs_info *ino = autofs4_dentry_ino(dentry); |
531 | struct autofs_info *p_ino; | 531 | struct autofs_info *p_ino; |
532 | struct inode *inode; | 532 | struct inode *inode; |
533 | size_t size = strlen(symname); | ||
533 | char *cp; | 534 | char *cp; |
534 | 535 | ||
535 | DPRINTK("%s <- %.*s", symname, | 536 | DPRINTK("%s <- %.*s", symname, |
@@ -544,8 +545,7 @@ static int autofs4_dir_symlink(struct inode *dir, | |||
544 | 545 | ||
545 | autofs4_del_active(dentry); | 546 | autofs4_del_active(dentry); |
546 | 547 | ||
547 | ino->size = strlen(symname); | 548 | cp = kmalloc(size + 1, GFP_KERNEL); |
548 | cp = kmalloc(ino->size + 1, GFP_KERNEL); | ||
549 | if (!cp) { | 549 | if (!cp) { |
550 | if (!dentry->d_fsdata) | 550 | if (!dentry->d_fsdata) |
551 | kfree(ino); | 551 | kfree(ino); |
@@ -562,6 +562,7 @@ static int autofs4_dir_symlink(struct inode *dir, | |||
562 | return -ENOMEM; | 562 | return -ENOMEM; |
563 | } | 563 | } |
564 | inode->i_private = cp; | 564 | inode->i_private = cp; |
565 | inode->i_size = size; | ||
565 | d_add(dentry, inode); | 566 | d_add(dentry, inode); |
566 | 567 | ||
567 | dentry->d_fsdata = ino; | 568 | dentry->d_fsdata = ino; |