* [PATCH 0/4] proc: Misc cleanups
@ 2006-09-10 3:58 Eric W. Biederman
2006-09-10 4:01 ` [PATCH 1/4] proc: Properly compute TGID_OFFSET Eric W. Biederman
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Eric W. Biederman @ 2006-09-10 3:58 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Jan Engelhardt
These patches are in response to the review of the last round
of my proc patches, and they remove one small glitch I found.
It turned out to be easy to remove the trailing empty directory entry
so I remove it, etc.
Eric
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/4] proc: Properly compute TGID_OFFSET 2006-09-10 3:58 [PATCH 0/4] proc: Misc cleanups Eric W. Biederman @ 2006-09-10 4:01 ` Eric W. Biederman 2006-09-10 4:01 ` [PATCH 2/4] proc: Remove trailing blank entry from pid_entry arrays Eric W. Biederman ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Eric W. Biederman @ 2006-09-10 4:01 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, Jan Engelhardt, Eric W. Biederman The value doesn't change but this ensures I will have the proper value when other files are added to proc_base_stuff. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- fs/proc/base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 04e29f9..c4fcd64 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1961,7 +1961,7 @@ retry: return task; } -#define TGID_OFFSET (FIRST_PROCESS_ENTRY + (1 /* /proc/self */)) +#define TGID_OFFSET (FIRST_PROCESS_ENTRY + (ARRAY_SIZE(proc_base_stuff) - 1)) static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldir, struct task_struct *task, int tgid) -- 1.4.2.rc3.g7e18e-dirty ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/4] proc: Remove trailing blank entry from pid_entry arrays. 2006-09-10 3:58 [PATCH 0/4] proc: Misc cleanups Eric W. Biederman 2006-09-10 4:01 ` [PATCH 1/4] proc: Properly compute TGID_OFFSET Eric W. Biederman @ 2006-09-10 4:01 ` Eric W. Biederman 2006-09-10 4:01 ` [PATCH 3/4] proc: Remove the useless SMP-safe comments from /proc Eric W. Biederman 2006-09-10 4:01 ` [PATCH 4/4] proc: Comment what proc_fill_cache does Eric W. Biederman 3 siblings, 0 replies; 5+ messages in thread From: Eric W. Biederman @ 2006-09-10 4:01 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, Jan Engelhardt, Eric W. Biederman It was pointed out that since I am taking ARRAY_SIZE anyway the trailing empty entry is silly and just wastes space. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- fs/proc/base.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index c4fcd64..725e279 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1377,12 +1377,13 @@ out: /* SMP-safe */ static struct dentry *proc_pident_lookup(struct inode *dir, struct dentry *dentry, - struct pid_entry *ents) + struct pid_entry *ents, + unsigned int nents) { struct inode *inode; struct dentry *error; struct task_struct *task = get_proc_task(dir); - struct pid_entry *p; + struct pid_entry *p, *last; error = ERR_PTR(-ENOENT); inode = NULL; @@ -1394,13 +1395,14 @@ static struct dentry *proc_pident_lookup * Yes, it does not scale. And it should not. Don't add * new entries into /proc/<tgid>/ without very good reasons. */ - for (p = ents; p->name; p++) { + last = &ents[nents - 1]; + for (p = ents; p <= last; p++) { if (p->len != dentry->d_name.len) continue; if (!memcmp(dentry->d_name.name, p->name, p->len)) break; } - if (!p->name) + if (p > last) goto out; error = proc_pident_instantiate(dir, dentry, task, p); @@ -1426,7 +1428,7 @@ static int proc_pident_readdir(struct fi struct dentry *dentry = filp->f_dentry; struct inode *inode = dentry->d_inode; struct task_struct *task = get_proc_task(inode); - struct pid_entry *p; + struct pid_entry *p, *last; ino_t ino; int ret; @@ -1459,7 +1461,8 @@ static int proc_pident_readdir(struct fi goto out; } p = ents + i; - while (p->name) { + last = &ents[nents - 1]; + while (p <= last) { if (proc_pident_fill_cache(filp, dirent, filldir, task, p) < 0) goto out; filp->f_pos++; @@ -1556,7 +1559,6 @@ static struct pid_entry attr_dir_stuff[] REG("fscreate", S_IRUGO|S_IWUGO, pid_attr), REG("keycreate", S_IRUGO|S_IWUGO, pid_attr), REG("sockcreate", S_IRUGO|S_IWUGO, pid_attr), - {} }; static int proc_attr_dir_readdir(struct file * filp, @@ -1574,7 +1576,8 @@ static struct file_operations proc_attr_ static struct dentry *proc_attr_dir_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) { - return proc_pident_lookup(dir, dentry, attr_dir_stuff); + return proc_pident_lookup(dir, dentry, + attr_dir_stuff, ARRAY_SIZE(attr_dir_stuff)); } static struct inode_operations proc_attr_dir_inode_operations = { @@ -1618,7 +1621,6 @@ static struct inode_operations proc_self static struct pid_entry proc_base_stuff[] = { NOD("self", S_IFLNK|S_IRWXUGO, &proc_self_inode_operations, NULL, {}), - {} }; /* @@ -1695,7 +1697,7 @@ static struct dentry *proc_base_lookup(s { struct dentry *error; struct task_struct *task = get_proc_task(dir); - struct pid_entry *p; + struct pid_entry *p, *last; error = ERR_PTR(-ENOENT); @@ -1703,13 +1705,14 @@ static struct dentry *proc_base_lookup(s goto out_no_task; /* Lookup the directory entry */ - for (p = proc_base_stuff; p->name; p++) { + last = &proc_base_stuff[ARRAY_SIZE(proc_base_stuff) - 1]; + for (p = proc_base_stuff; p <= last; p++) { if (p->len != dentry->d_name.len) continue; if (!memcmp(dentry->d_name.name, p->name, p->len)) break; } - if (!p->name) + if (p > last) goto out; error = proc_base_instantiate(dir, dentry, task, p); @@ -1775,7 +1778,6 @@ #endif #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, loginuid), #endif - {} }; static int proc_tgid_base_readdir(struct file * filp, @@ -1791,7 +1793,8 @@ static struct file_operations proc_tgid_ }; static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ - return proc_pident_lookup(dir, dentry, tgid_base_stuff); + return proc_pident_lookup(dir, dentry, + tgid_base_stuff, ARRAY_SIZE(tgid_base_stuff)); } static struct inode_operations proc_tgid_base_inode_operations = { @@ -1961,7 +1964,7 @@ retry: return task; } -#define TGID_OFFSET (FIRST_PROCESS_ENTRY + (ARRAY_SIZE(proc_base_stuff) - 1)) +#define TGID_OFFSET (FIRST_PROCESS_ENTRY + ARRAY_SIZE(proc_base_stuff)) static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldir, struct task_struct *task, int tgid) @@ -1983,7 +1986,7 @@ int proc_pid_readdir(struct file * filp, if (!reaper) goto out_no_task; - for (; nr < (ARRAY_SIZE(proc_base_stuff) - 1); filp->f_pos++, nr++) { + for (; nr < ARRAY_SIZE(proc_base_stuff); filp->f_pos++, nr++) { struct pid_entry *p = &proc_base_stuff[nr]; if (proc_base_fill_cache(filp, dirent, filldir, reaper, p) < 0) goto out; @@ -2050,7 +2053,6 @@ #endif #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, loginuid), #endif - {} }; static int proc_tid_base_readdir(struct file * filp, @@ -2061,7 +2063,8 @@ static int proc_tid_base_readdir(struct } static struct dentry *proc_tid_base_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ - return proc_pident_lookup(dir, dentry, tid_base_stuff); + return proc_pident_lookup(dir, dentry, + tid_base_stuff, ARRAY_SIZE(tid_base_stuff)); } static struct file_operations proc_tid_base_operations = { -- 1.4.2.rc3.g7e18e-dirty ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/4] proc: Remove the useless SMP-safe comments from /proc 2006-09-10 3:58 [PATCH 0/4] proc: Misc cleanups Eric W. Biederman 2006-09-10 4:01 ` [PATCH 1/4] proc: Properly compute TGID_OFFSET Eric W. Biederman 2006-09-10 4:01 ` [PATCH 2/4] proc: Remove trailing blank entry from pid_entry arrays Eric W. Biederman @ 2006-09-10 4:01 ` Eric W. Biederman 2006-09-10 4:01 ` [PATCH 4/4] proc: Comment what proc_fill_cache does Eric W. Biederman 3 siblings, 0 replies; 5+ messages in thread From: Eric W. Biederman @ 2006-09-10 4:01 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, Jan Engelhardt, Eric W. Biederman Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- fs/proc/base.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 725e279..433a01d 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1247,7 +1247,6 @@ out_iput: goto out; } -/* SMP-safe */ static struct dentry *proc_lookupfd(struct inode * dir, struct dentry * dentry, struct nameidata *nd) { struct task_struct *task = get_proc_task(dir); @@ -1374,7 +1373,6 @@ out: return error; } -/* SMP-safe */ static struct dentry *proc_pident_lookup(struct inode *dir, struct dentry *dentry, struct pid_entry *ents, @@ -1899,7 +1897,6 @@ out: return error; } -/* SMP-safe */ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) { struct dentry *result = ERR_PTR(-ENOENT); @@ -2106,7 +2103,6 @@ out: return error; } -/* SMP-safe */ static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd) { struct dentry *result = ERR_PTR(-ENOENT); -- 1.4.2.rc3.g7e18e-dirty ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] proc: Comment what proc_fill_cache does. 2006-09-10 3:58 [PATCH 0/4] proc: Misc cleanups Eric W. Biederman ` (2 preceding siblings ...) 2006-09-10 4:01 ` [PATCH 3/4] proc: Remove the useless SMP-safe comments from /proc Eric W. Biederman @ 2006-09-10 4:01 ` Eric W. Biederman 3 siblings, 0 replies; 5+ messages in thread From: Eric W. Biederman @ 2006-09-10 4:01 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, Jan Engelhardt, Eric W. Biederman Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> --- fs/proc/base.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 433a01d..a317eb2 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1057,6 +1057,18 @@ static struct dentry_operations pid_dent typedef struct dentry *instantiate_t(struct inode *, struct dentry *, struct task_struct *, void *); +/* + * Fill a directory entry. + * + * If possible create the dcache entry and derive our inode number and + * file type from dcache entry. + * + * Since all of the proc inode numbers are dynamically generated, the inode + * numbers do not exist until the inode is cache. This means creating the + * the dcache entry in readdir is necessary to keep the inode numbers + * reported by readdir in sync with the inode numbers reported + * by stat. + */ static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, char *name, int len, instantiate_t instantiate, struct task_struct *task, void *ptr) -- 1.4.2.rc3.g7e18e-dirty ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-09-10 4:02 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2006-09-10 3:58 [PATCH 0/4] proc: Misc cleanups Eric W. Biederman 2006-09-10 4:01 ` [PATCH 1/4] proc: Properly compute TGID_OFFSET Eric W. Biederman 2006-09-10 4:01 ` [PATCH 2/4] proc: Remove trailing blank entry from pid_entry arrays Eric W. Biederman 2006-09-10 4:01 ` [PATCH 3/4] proc: Remove the useless SMP-safe comments from /proc Eric W. Biederman 2006-09-10 4:01 ` [PATCH 4/4] proc: Comment what proc_fill_cache does Eric W. Biederman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®