path: root/fs/proc
diff options
authorMuchun Song <>2022-01-21 22:14:20 -0800
committerLinus Torvalds <>2022-01-22 08:33:37 +0200
commit6dfbbae14a7b961f41d80a106e1ab60e86d061c5 (patch)
tree487d7ecefb4ad5b67b697fd7f99567a795c23455 /fs/proc
parenta37265995c867a4e413761d846cef0445b08d6d5 (diff)
fs: proc: store PDE()->data into inode->i_private
PDE_DATA(inode) is introduced to get user private data and hide the layout of struct proc_dir_entry. The inode->i_private is used to do the same thing as well. Save a copy of user private data to inode-> i_private when proc inode is allocated. This means the user also can get their private data by inode->i_private. Introduce pde_data() to wrap inode->i_private so that we can remove PDE_DATA() from fs/proc/generic.c and make PTE_DATE() as a wrapper of pde_data(). It will be easier if we decide to remove PDE_DATE() in the future. Link: Signed-off-by: Muchun Song <> Acked-by: Christian Brauner <> Cc: Alexey Dobriyan <> Cc: Alexey Gladkov <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'fs/proc')
3 files changed, 1 insertions, 11 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 5b78739e60e4..f2132407e133 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -791,12 +791,6 @@ void proc_remove(struct proc_dir_entry *de)
-void *PDE_DATA(const struct inode *inode)
- return __PDE_DATA(inode);
* Pull a user buffer into memory and pass it to the file's write handler if
* one is supplied. The ->write() method is permitted to modify the
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 599eb724ff2d..f84355c5a36d 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -650,6 +650,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
return NULL;
+ inode->i_private = de->data;
inode->i_ino = de->low_ino;
inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
PROC_I(inode)->pde = de;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 03415f3fb3a8..06a80f78433d 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -115,11 +115,6 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode)
return PROC_I(inode)->pde;
-static inline void *__PDE_DATA(const struct inode *inode)
- return PDE(inode)->data;
static inline struct pid *proc_pid(const struct inode *inode)
return PROC_I(inode)->pid;