mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS updates from Al Viro,
Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).
7kloc removed.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
don't bother with deferred freeing of fdtables
proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
proc: Make the PROC_I() and PDE() macros internal to procfs
proc: Supply a function to remove a proc entry by PDE
take cgroup_open() and cpuset_open() to fs/proc/base.c
ppc: Clean up scanlog
ppc: Clean up rtas_flash driver somewhat
hostap: proc: Use remove_proc_subtree()
drm: proc: Use remove_proc_subtree()
drm: proc: Use minor->index to label things, not PDE->name
drm: Constify drm_proc_list[]
zoran: Don't print proc_dir_entry data in debug
reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
proc: Supply an accessor for getting the data from a PDE's parent
airo: Use remove_proc_subtree()
rtl8192u: Don't need to save device proc dir PDE
rtl8187se: Use a dir under /proc/net/r8180/
proc: Add proc_mkdir_data()
proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
proc: Move PDE_NET() to fs/proc/proc_net.c
...
This commit is contained in:
commit
20b4fb4852
385 changed files with 7396 additions and 14540 deletions
|
|
@ -105,7 +105,7 @@ clusterip_config_entry_put(struct clusterip_config *c)
|
|||
* functions are also incrementing the refcount on their own,
|
||||
* so it's safe to remove the entry even if it's in use. */
|
||||
#ifdef CONFIG_PROC_FS
|
||||
remove_proc_entry(c->pde->name, c->pde->parent);
|
||||
proc_remove(c->pde);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
|
@ -631,7 +631,7 @@ static int clusterip_proc_open(struct inode *inode, struct file *file)
|
|||
|
||||
if (!ret) {
|
||||
struct seq_file *sf = file->private_data;
|
||||
struct clusterip_config *c = PDE(inode)->data;
|
||||
struct clusterip_config *c = PDE_DATA(inode);
|
||||
|
||||
sf->private = c;
|
||||
|
||||
|
|
@ -643,7 +643,7 @@ static int clusterip_proc_open(struct inode *inode, struct file *file)
|
|||
|
||||
static int clusterip_proc_release(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct clusterip_config *c = PDE(inode)->data;
|
||||
struct clusterip_config *c = PDE_DATA(inode);
|
||||
int ret;
|
||||
|
||||
ret = seq_release(inode, file);
|
||||
|
|
@ -657,7 +657,7 @@ static int clusterip_proc_release(struct inode *inode, struct file *file)
|
|||
static ssize_t clusterip_proc_write(struct file *file, const char __user *input,
|
||||
size_t size, loff_t *ofs)
|
||||
{
|
||||
struct clusterip_config *c = PDE(file_inode(file))->data;
|
||||
struct clusterip_config *c = PDE_DATA(file_inode(file));
|
||||
#define PROC_WRITELEN 10
|
||||
char buffer[PROC_WRITELEN+1];
|
||||
unsigned long nodenum;
|
||||
|
|
@ -736,7 +736,7 @@ static void __exit clusterip_tg_exit(void)
|
|||
{
|
||||
pr_info("ClusterIP Version %s unloading\n", CLUSTERIP_VERSION);
|
||||
#ifdef CONFIG_PROC_FS
|
||||
remove_proc_entry(clusterip_procdir->name, clusterip_procdir->parent);
|
||||
proc_remove(clusterip_procdir);
|
||||
#endif
|
||||
nf_unregister_hook(&cip_arp_ops);
|
||||
xt_unregister_target(&clusterip_tg_reg);
|
||||
|
|
|
|||
|
|
@ -2583,7 +2583,7 @@ static void tcp_seq_stop(struct seq_file *seq, void *v)
|
|||
|
||||
int tcp_seq_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct tcp_seq_afinfo *afinfo = PDE(inode)->data;
|
||||
struct tcp_seq_afinfo *afinfo = PDE_DATA(inode);
|
||||
struct tcp_iter_state *s;
|
||||
int err;
|
||||
|
||||
|
|
|
|||
|
|
@ -2100,7 +2100,7 @@ static void udp_seq_stop(struct seq_file *seq, void *v)
|
|||
|
||||
int udp_seq_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct udp_seq_afinfo *afinfo = PDE(inode)->data;
|
||||
struct udp_seq_afinfo *afinfo = PDE_DATA(inode);
|
||||
struct udp_iter_state *s;
|
||||
int err;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue