* linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
@ 2010-04-27 5:06 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-04-27 5:06 UTC (permalink / raw)
To: "Frédéric Weisbecker"
Cc: linux-next, linux-kernel, Arnd Bergmann, Linus Torvalds
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
Hi Frédéric,
Today's linux-next merge of the bkl-ioctl tree got conflicts in
drivers/char/i8k.c, net/sunrpc/cache.c and
drivers/isdn/divert/divert_procfs.c between commit
64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
ioctl") from the bkl-procfs tree and commit
1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
tree.
I used the versions from the bkl-procfs tree for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
@ 2010-04-27 5:06 Stephen Rothwell
2010-04-27 5:18 ` Frederic Weisbecker
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-04-27 5:06 UTC (permalink / raw)
To: "Frédéric Weisbecker"
Cc: linux-next, linux-kernel, Arnd Bergmann, Linus Torvalds
Hi Frédéric,
Today's linux-next merge of the bkl-ioctl tree got a conflict in
fs/proc/inode.c between commit 3ab8dfb0802f33741cc4afa6adf7cb30b1cd1761
("procfs: Kill the bkl in ioctl") from the bkl-procfs tree and commit
1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
tree.
I fixed it up (see below - probably not optimal) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/proc/inode.c
index aea8502,8e8f813..0000000
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@@ -231,10 -231,10 +231,10 @@@ static long proc_reg_unlocked_ioctl(str
rv = unlocked_ioctl(file, cmd, arg);
if (rv == -ENOIOCTLCMD)
rv = -EINVAL;
- } else if (ioctl) {
+ } else if (bkl_ioctl) {
- lock_kernel();
+ WARN_ONCE(1, "Procfs ioctl handlers must use unlocked_ioctl, "
+ "%pf will be called without the Bkl held\n", bkl_ioctl);
- rv = ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
+ rv = bkl_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
- unlock_kernel();
}
pde_users_dec(pde);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
2010-04-27 5:06 Stephen Rothwell
@ 2010-04-27 5:18 ` Frederic Weisbecker
0 siblings, 0 replies; 6+ messages in thread
From: Frederic Weisbecker @ 2010-04-27 5:18 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Arnd Bergmann, Linus Torvalds
On Tue, Apr 27, 2010 at 03:06:36PM +1000, Stephen Rothwell wrote:
> Hi Frédéric,
>
> Today's linux-next merge of the bkl-ioctl tree got a conflict in
> fs/proc/inode.c between commit 3ab8dfb0802f33741cc4afa6adf7cb30b1cd1761
> ("procfs: Kill the bkl in ioctl") from the bkl-procfs tree and commit
> 1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
> file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioctl
> tree.
>
> I fixed it up (see below - probably not optimal) and can carry the fix as
> necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc fs/proc/inode.c
> index aea8502,8e8f813..0000000
> --- a/fs/proc/inode.c
> +++ b/fs/proc/inode.c
> @@@ -231,10 -231,10 +231,10 @@@ static long proc_reg_unlocked_ioctl(str
> rv = unlocked_ioctl(file, cmd, arg);
> if (rv == -ENOIOCTLCMD)
> rv = -EINVAL;
> - } else if (ioctl) {
> + } else if (bkl_ioctl) {
> - lock_kernel();
> + WARN_ONCE(1, "Procfs ioctl handlers must use unlocked_ioctl, "
> + "%pf will be called without the Bkl held\n", bkl_ioctl);
> - rv = ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
> + rv = bkl_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
> - unlock_kernel();
> }
>
> pde_users_dec(pde);
Thanks, looks like the right fix!
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
@ 2010-04-29 5:49 Stephen Rothwell
2010-04-29 20:59 ` Frederic Weisbecker
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-04-29 5:49 UTC (permalink / raw)
To: "Frédéric Weisbecker"
Cc: linux-next, linux-kernel, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
Hi Frédéric,
Today's linux-next merge of the bkl-ioctl tree got a conflict in
drivers/char/i8k.c between commit
64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
ioctl") from the bkl-procfs tree and commit
59ce88717d9d8af8cb14af3a0a505cafb692b482 ("drivers: Push down BKL into
various drivers") from the bkl-ioctl tree.
I used the version from the bkl-procfs tree for today.
Can you guys please sort out these various bkl removal trees, please.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
@ 2010-04-29 5:50 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-04-29 5:50 UTC (permalink / raw)
To: "Frédéric Weisbecker"
Cc: linux-next, linux-kernel, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
Hi Frédéric,
Today's linux-next merge of the bkl-ioctl tree got a conflict in
drivers/isdn/divert/divert_procfs.c between commit
64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
ioctl") from the bkl-procfs tree and commit
5cc2443e44f810a21d1228ac9bf60b41536e5b9c ("isdn: Push down BKL into ioctl
functions") from the bkl-ioctl tree.
I used the version from the blk-procfs tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
2010-04-29 5:49 linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree Stephen Rothwell
@ 2010-04-29 20:59 ` Frederic Weisbecker
0 siblings, 0 replies; 6+ messages in thread
From: Frederic Weisbecker @ 2010-04-29 20:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Arnd Bergmann
On Thu, Apr 29, 2010 at 03:49:54PM +1000, Stephen Rothwell wrote:
> Hi Frédéric,
>
> Today's linux-next merge of the bkl-ioctl tree got a conflict in
> drivers/char/i8k.c between commit
> 64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from
> ioctl") from the bkl-procfs tree and commit
> 59ce88717d9d8af8cb14af3a0a505cafb692b482 ("drivers: Push down BKL into
> various drivers") from the bkl-ioctl tree.
>
> I used the version from the bkl-procfs tree for today.
>
> Can you guys please sort out these various bkl removal trees, please.
I'll do a test merge of my branches and solve the conflicts I can find.
Sorry about that.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-04-30 18:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-29 5:49 linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree Stephen Rothwell
2010-04-29 20:59 ` Frederic Weisbecker
-- strict thread matches above, loose matches on Subject: below --
2010-04-29 5:50 Stephen Rothwell
2010-04-27 5:06 Stephen Rothwell
2010-04-27 5:18 ` Frederic Weisbecker
2010-04-27 5:06 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).