diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-29 15:58:39 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-30 13:01:03 -0500 |
commit | fceef393a538134f03b778c5d2519e670269342f (patch) | |
tree | cd43c9afdc07852d286965ad4d11772f6c275d1a /fs/ecryptfs | |
parent | cd3417c8fc9504cc1afe944515f338aff9ec286b (diff) |
switch ->get_link() to delayed_call, kill ->put_link()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r-- | fs/ecryptfs/inode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 5a05559cb23d..a4dddc61594c 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
@@ -675,7 +675,8 @@ out: | |||
675 | } | 675 | } |
676 | 676 | ||
677 | static const char *ecryptfs_get_link(struct dentry *dentry, | 677 | static const char *ecryptfs_get_link(struct dentry *dentry, |
678 | struct inode *inode, void **cookie) | 678 | struct inode *inode, |
679 | struct delayed_call *done) | ||
679 | { | 680 | { |
680 | size_t len; | 681 | size_t len; |
681 | char *buf; | 682 | char *buf; |
@@ -689,7 +690,8 @@ static const char *ecryptfs_get_link(struct dentry *dentry, | |||
689 | fsstack_copy_attr_atime(d_inode(dentry), | 690 | fsstack_copy_attr_atime(d_inode(dentry), |
690 | d_inode(ecryptfs_dentry_to_lower(dentry))); | 691 | d_inode(ecryptfs_dentry_to_lower(dentry))); |
691 | buf[len] = '\0'; | 692 | buf[len] = '\0'; |
692 | return *cookie = buf; | 693 | set_delayed_call(done, kfree_link, buf); |
694 | return buf; | ||
693 | } | 695 | } |
694 | 696 | ||
695 | /** | 697 | /** |
@@ -1102,7 +1104,6 @@ out: | |||
1102 | const struct inode_operations ecryptfs_symlink_iops = { | 1104 | const struct inode_operations ecryptfs_symlink_iops = { |
1103 | .readlink = generic_readlink, | 1105 | .readlink = generic_readlink, |
1104 | .get_link = ecryptfs_get_link, | 1106 | .get_link = ecryptfs_get_link, |
1105 | .put_link = kfree_put_link, | ||
1106 | .permission = ecryptfs_permission, | 1107 | .permission = ecryptfs_permission, |
1107 | .setattr = ecryptfs_setattr, | 1108 | .setattr = ecryptfs_setattr, |
1108 | .getattr = ecryptfs_getattr_link, | 1109 | .getattr = ecryptfs_getattr_link, |