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/fuse/dir.c | |
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/fuse/dir.c')
-rw-r--r-- | fs/fuse/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index def0a4d082bc..712601f299b8 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c | |||
@@ -1366,7 +1366,8 @@ static int fuse_readdir(struct file *file, struct dir_context *ctx) | |||
1366 | } | 1366 | } |
1367 | 1367 | ||
1368 | static const char *fuse_get_link(struct dentry *dentry, | 1368 | static const char *fuse_get_link(struct dentry *dentry, |
1369 | struct inode *inode, void **cookie) | 1369 | struct inode *inode, |
1370 | struct delayed_call *done) | ||
1370 | { | 1371 | { |
1371 | struct fuse_conn *fc = get_fuse_conn(inode); | 1372 | struct fuse_conn *fc = get_fuse_conn(inode); |
1372 | FUSE_ARGS(args); | 1373 | FUSE_ARGS(args); |
@@ -1392,7 +1393,7 @@ static const char *fuse_get_link(struct dentry *dentry, | |||
1392 | link = ERR_PTR(ret); | 1393 | link = ERR_PTR(ret); |
1393 | } else { | 1394 | } else { |
1394 | link[ret] = '\0'; | 1395 | link[ret] = '\0'; |
1395 | *cookie = link; | 1396 | set_delayed_call(done, kfree_link, link); |
1396 | } | 1397 | } |
1397 | fuse_invalidate_atime(inode); | 1398 | fuse_invalidate_atime(inode); |
1398 | return link; | 1399 | return link; |
@@ -1913,7 +1914,6 @@ static const struct inode_operations fuse_common_inode_operations = { | |||
1913 | static const struct inode_operations fuse_symlink_inode_operations = { | 1914 | static const struct inode_operations fuse_symlink_inode_operations = { |
1914 | .setattr = fuse_setattr, | 1915 | .setattr = fuse_setattr, |
1915 | .get_link = fuse_get_link, | 1916 | .get_link = fuse_get_link, |
1916 | .put_link = kfree_put_link, | ||
1917 | .readlink = generic_readlink, | 1917 | .readlink = generic_readlink, |
1918 | .getattr = fuse_getattr, | 1918 | .getattr = fuse_getattr, |
1919 | .setxattr = fuse_setxattr, | 1919 | .setxattr = fuse_setxattr, |