On Tue 05-05-15 06:21:46, Al Viro wrote:
> From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
>
> Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/debugfs/file.c | 12 ------------
> fs/debugfs/inode.c | 6 +++---
> include/linux/debugfs.h | 1 -
> 3 files changed, 3 insertions(+), 16 deletions(-)
>
> diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
> index 830a7e7..284f9aa 100644
> --- a/fs/debugfs/file.c
> +++ b/fs/debugfs/file.c
> @@ -17,7 +17,6 @@
> #include <linux/fs.h>
> #include <linux/seq_file.h>
> #include <linux/pagemap.h>
> -#include <linux/namei.h>
> #include <linux/debugfs.h>
> #include <linux/io.h>
> #include <linux/slab.h>
> @@ -43,17 +42,6 @@ const struct file_operations debugfs_file_operations = {
> .llseek = noop_llseek,
> };
>
> -static void *debugfs_follow_link(struct dentry *dentry, struct nameidata *nd)
> -{
> - nd_set_link(nd, d_inode(dentry)->i_private);
> - return NULL;
> -}
> -
> -const struct inode_operations debugfs_link_operations = {
> - .readlink = generic_readlink,
> - .follow_link = debugfs_follow_link,
> -};
> -
> static int debugfs_u8_set(void *data, u64 val)
> {
> *(u8 *)data = val;
> diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
> index c1e7ffb..7eaec88 100644
> --- a/fs/debugfs/inode.c
> +++ b/fs/debugfs/inode.c
> @@ -174,7 +174,7 @@ static void debugfs_evict_inode(struct inode *inode)
> truncate_inode_pages_final(&inode->i_data);
> clear_inode(inode);
> if (S_ISLNK(inode->i_mode))
> - kfree(inode->i_private);
> + kfree(inode->i_link);
> }
>
> static const struct super_operations debugfs_super_operations = {
> @@ -511,8 +511,8 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
> return failed_creating(dentry);
> }
> inode->i_mode = S_IFLNK | S_IRWXUGO;
> - inode->i_op = &debugfs_link_operations;
> - inode->i_private = link;
> + inode->i_op = &simple_symlink_inode_operations;
> + inode->i_link = link;
> d_instantiate(dentry, inode);
> return end_creating(dentry);
> }
> diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
> index cb25af4..420311b 100644
> --- a/include/linux/debugfs.h
> +++ b/include/linux/debugfs.h
> @@ -45,7 +45,6 @@ extern struct dentry *arch_debugfs_dir;
>
> /* declared over in file.c */
> extern const struct file_operations debugfs_file_operations;
> -extern const struct inode_operations debugfs_link_operations;
>
> struct dentry *debugfs_create_file(const char *name, umode_t mode,
> struct dentry *parent, void *data,
> --
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
