Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 271a15ea authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

proc: Supply PDE attribute setting accessor functions



Supply accessor functions to set attributes in proc_dir_entry structs.

The following are supplied: proc_set_size() and proc_set_user().

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
cc: linuxppc-dev@lists.ozlabs.org
cc: linux-media@vger.kernel.org
cc: netdev@vger.kernel.org
cc: linux-wireless@vger.kernel.org
cc: linux-pci@vger.kernel.org
cc: netfilter-devel@vger.kernel.org
cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2f96b8c1
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ static int __init proc_ppc64_init(void)
			       &page_map_fops, vdso_data);
			       &page_map_fops, vdso_data);
	if (!pde)
	if (!pde)
		return 1;
		return 1;
	pde->size = PAGE_SIZE;
	proc_set_size(pde, PAGE_SIZE);


	return 0;
	return 0;
}
}
+1 −1
Original line number Original line Diff line number Diff line
@@ -452,7 +452,7 @@ static int proc_ppc64_create_ofdt(void)


	ent = proc_create("powerpc/ofdt", S_IWUSR, NULL, &ofdt_fops);
	ent = proc_create("powerpc/ofdt", S_IWUSR, NULL, &ofdt_fops);
	if (ent)
	if (ent)
		ent->size = 0;
		proc_set_size(ent, 0);


	return 0;
	return 0;
}
}
+1 −1
Original line number Original line Diff line number Diff line
@@ -375,7 +375,7 @@ int av7110_ir_init(struct av7110 *av7110)
	if (av_cnt == 1) {
	if (av_cnt == 1) {
		e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops);
		e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops);
		if (e)
		if (e)
			e->size = 4 + 256 * sizeof(u16);
			proc_set_size(e, 4 + 256 * sizeof(u16));
	}
	}


	tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir);
	tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir);
+1 −1
Original line number Original line Diff line number Diff line
@@ -1678,7 +1678,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)
			IRDA_WARNING("%s: failed to create proc entry\n",
			IRDA_WARNING("%s: failed to create proc entry\n",
				     __func__);
				     __func__);
		} else {
		} else {
			ent->size = 0;
			proc_set_size(ent, 0);
		}
		}
		idev->proc_entry = ent;
		idev->proc_entry = ent;
	}
	}
+11 −23
Original line number Original line Diff line number Diff line
@@ -4507,73 +4507,63 @@ static int setup_proc_entry( struct net_device *dev,
					    airo_entry);
					    airo_entry);
	if (!apriv->proc_entry)
	if (!apriv->proc_entry)
		goto fail;
		goto fail;
	apriv->proc_entry->uid = proc_kuid;
	proc_set_user(apriv->proc_entry, proc_kuid, proc_kgid);
	apriv->proc_entry->gid = proc_kgid;


	/* Setup the StatsDelta */
	/* Setup the StatsDelta */
	entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm,
	entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm,
				 apriv->proc_entry, &proc_statsdelta_ops, dev);
				 apriv->proc_entry, &proc_statsdelta_ops, dev);
	if (!entry)
	if (!entry)
		goto fail_stats_delta;
		goto fail_stats_delta;
	entry->uid = proc_kuid;
	proc_set_user(entry, proc_kuid, proc_kgid);
	entry->gid = proc_kgid;


	/* Setup the Stats */
	/* Setup the Stats */
	entry = proc_create_data("Stats", S_IRUGO & proc_perm,
	entry = proc_create_data("Stats", S_IRUGO & proc_perm,
				 apriv->proc_entry, &proc_stats_ops, dev);
				 apriv->proc_entry, &proc_stats_ops, dev);
	if (!entry)
	if (!entry)
		goto fail_stats;
		goto fail_stats;
	entry->uid = proc_kuid;
	proc_set_user(entry, proc_kuid, proc_kgid);
	entry->gid = proc_kgid;


	/* Setup the Status */
	/* Setup the Status */
	entry = proc_create_data("Status", S_IRUGO & proc_perm,
	entry = proc_create_data("Status", S_IRUGO & proc_perm,
				 apriv->proc_entry, &proc_status_ops, dev);
				 apriv->proc_entry, &proc_status_ops, dev);
	if (!entry)
	if (!entry)
		goto fail_status;
		goto fail_status;
	entry->uid = proc_kuid;
	proc_set_user(entry, proc_kuid, proc_kgid);
	entry->gid = proc_kgid;


	/* Setup the Config */
	/* Setup the Config */
	entry = proc_create_data("Config", proc_perm,
	entry = proc_create_data("Config", proc_perm,
				 apriv->proc_entry, &proc_config_ops, dev);
				 apriv->proc_entry, &proc_config_ops, dev);
	if (!entry)
	if (!entry)
		goto fail_config;
		goto fail_config;
	entry->uid = proc_kuid;
	proc_set_user(entry, proc_kuid, proc_kgid);
	entry->gid = proc_kgid;


	/* Setup the SSID */
	/* Setup the SSID */
	entry = proc_create_data("SSID", proc_perm,
	entry = proc_create_data("SSID", proc_perm,
				 apriv->proc_entry, &proc_SSID_ops, dev);
				 apriv->proc_entry, &proc_SSID_ops, dev);
	if (!entry)
	if (!entry)
		goto fail_ssid;
		goto fail_ssid;
	entry->uid = proc_kuid;
	proc_set_user(entry, proc_kuid, proc_kgid);
	entry->gid = proc_kgid;


	/* Setup the APList */
	/* Setup the APList */
	entry = proc_create_data("APList", proc_perm,
	entry = proc_create_data("APList", proc_perm,
				 apriv->proc_entry, &proc_APList_ops, dev);
				 apriv->proc_entry, &proc_APList_ops, dev);
	if (!entry)
	if (!entry)
		goto fail_aplist;
		goto fail_aplist;
	entry->uid = proc_kuid;
	proc_set_user(entry, proc_kuid, proc_kgid);
	entry->gid = proc_kgid;


	/* Setup the BSSList */
	/* Setup the BSSList */
	entry = proc_create_data("BSSList", proc_perm,
	entry = proc_create_data("BSSList", proc_perm,
				 apriv->proc_entry, &proc_BSSList_ops, dev);
				 apriv->proc_entry, &proc_BSSList_ops, dev);
	if (!entry)
	if (!entry)
		goto fail_bsslist;
		goto fail_bsslist;
	entry->uid = proc_kuid;
	proc_set_user(entry, proc_kuid, proc_kgid);
	entry->gid = proc_kgid;


	/* Setup the WepKey */
	/* Setup the WepKey */
	entry = proc_create_data("WepKey", proc_perm,
	entry = proc_create_data("WepKey", proc_perm,
				 apriv->proc_entry, &proc_wepkey_ops, dev);
				 apriv->proc_entry, &proc_wepkey_ops, dev);
	if (!entry)
	if (!entry)
		goto fail_wepkey;
		goto fail_wepkey;
	entry->uid = proc_kuid;
	proc_set_user(entry, proc_kuid, proc_kgid);
	entry->gid = proc_kgid;

	return 0;
	return 0;


fail_wepkey:
fail_wepkey:
@@ -5695,10 +5685,8 @@ static int __init airo_init_module( void )


	airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL);
	airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL);


	if (airo_entry) {
	if (airo_entry)
		airo_entry->uid = proc_kuid;
		proc_set_user(airo_entry, proc_kuid, proc_kgid);
		airo_entry->gid = proc_kgid;
	}


	for (i = 0; i < 4 && io[i] && irq[i]; i++) {
	for (i = 0; i < 4 && io[i] && irq[i]; i++) {
		airo_print_info("", "Trying to configure ISA adapter at irq=%d "
		airo_print_info("", "Trying to configure ISA adapter at irq=%d "
Loading