Re: linux-next: manual merge of the tip tree with the nfs tree
* Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in
> fs/nfs/blocklayout/blocklayoutdev.c and
> fs/nfs/blocklayout/blocklayoutdm.c between commit 871760ce97a9
> ("pnfs/blocklayout: move all rpc_pipefs related code into a single
> file") from the nfs tree and commit f139caf2e897 ("sched, cleanup,
> treewide: Remove set_current_state(TASK_RUNNING) after schedule()")
> from the tip tree.
>
> I fixed it up (the former move the code in these two files into
> fs/nfs/blocklayout/rpc_pipefs.c, so I deleted the 2 files and applied
> the following merge fix patch) and can carry the fix as necessary (no
> action is required).
>
> From: Stephen Rothwell
> Date: Mon, 22 Sep 2014 13:29:19 +1000
> Subject: [PATCH] pnfs: merge fixup for sched cleanup of
> set_current_state(TASK_RUNNING)
>
> Signed-off-by: Stephen Rothwell
> ---
> fs/nfs/blocklayout/rpc_pipefs.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/fs/nfs/blocklayout/rpc_pipefs.c b/fs/nfs/blocklayout/rpc_pipefs.c
> index 8d04bda2bd2e..e966c023b1b7 100644
> --- a/fs/nfs/blocklayout/rpc_pipefs.c
> +++ b/fs/nfs/blocklayout/rpc_pipefs.c
> @@ -92,7 +92,6 @@ bl_resolve_deviceid(struct nfs_server *server, struct
> pnfs_block_volume *b,
>
> set_current_state(TASK_UNINTERRUPTIBLE);
> schedule();
> - __set_current_state(TASK_RUNNING);
> remove_wait_queue(>bl_wq, );
>
> if (reply->status != BL_DEVICE_REQUEST_PROC) {
Looks good, thanks Stephen!
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the tip tree with the nfs tree
* Stephen Rothwell s...@canb.auug.org.au wrote:
Hi all,
Today's linux-next merge of the tip tree got conflicts in
fs/nfs/blocklayout/blocklayoutdev.c and
fs/nfs/blocklayout/blocklayoutdm.c between commit 871760ce97a9
(pnfs/blocklayout: move all rpc_pipefs related code into a single
file) from the nfs tree and commit f139caf2e897 (sched, cleanup,
treewide: Remove set_current_state(TASK_RUNNING) after schedule())
from the tip tree.
I fixed it up (the former move the code in these two files into
fs/nfs/blocklayout/rpc_pipefs.c, so I deleted the 2 files and applied
the following merge fix patch) and can carry the fix as necessary (no
action is required).
From: Stephen Rothwell s...@canb.auug.org.au
Date: Mon, 22 Sep 2014 13:29:19 +1000
Subject: [PATCH] pnfs: merge fixup for sched cleanup of
set_current_state(TASK_RUNNING)
Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
---
fs/nfs/blocklayout/rpc_pipefs.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/nfs/blocklayout/rpc_pipefs.c b/fs/nfs/blocklayout/rpc_pipefs.c
index 8d04bda2bd2e..e966c023b1b7 100644
--- a/fs/nfs/blocklayout/rpc_pipefs.c
+++ b/fs/nfs/blocklayout/rpc_pipefs.c
@@ -92,7 +92,6 @@ bl_resolve_deviceid(struct nfs_server *server, struct
pnfs_block_volume *b,
set_current_state(TASK_UNINTERRUPTIBLE);
schedule();
- __set_current_state(TASK_RUNNING);
remove_wait_queue(nn-bl_wq, wq);
if (reply-status != BL_DEVICE_REQUEST_PROC) {
Looks good, thanks Stephen!
Ingo
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the tip tree with the nfs tree
Thanks Stephen, the fixup looks obviously correct to me. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the tip tree with the nfs tree
Thanks Stephen, the fixup looks obviously correct to me. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the tip tree with the nfs tree
Hi all,
Today's linux-next merge of the tip tree got conflicts in
fs/nfs/blocklayout/blocklayoutdev.c and
fs/nfs/blocklayout/blocklayoutdm.c between commit 871760ce97a9
("pnfs/blocklayout: move all rpc_pipefs related code into a single
file") from the nfs tree and commit f139caf2e897 ("sched, cleanup,
treewide: Remove set_current_state(TASK_RUNNING) after schedule()")
from the tip tree.
I fixed it up (the former move the code in these two files into
fs/nfs/blocklayout/rpc_pipefs.c, so I deleted the 2 files and applied
the following merge fix patch) and can carry the fix as necessary (no
action is required).
From: Stephen Rothwell
Date: Mon, 22 Sep 2014 13:29:19 +1000
Subject: [PATCH] pnfs: merge fixup for sched cleanup of
set_current_state(TASK_RUNNING)
Signed-off-by: Stephen Rothwell
---
fs/nfs/blocklayout/rpc_pipefs.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/nfs/blocklayout/rpc_pipefs.c b/fs/nfs/blocklayout/rpc_pipefs.c
index 8d04bda2bd2e..e966c023b1b7 100644
--- a/fs/nfs/blocklayout/rpc_pipefs.c
+++ b/fs/nfs/blocklayout/rpc_pipefs.c
@@ -92,7 +92,6 @@ bl_resolve_deviceid(struct nfs_server *server, struct
pnfs_block_volume *b,
set_current_state(TASK_UNINTERRUPTIBLE);
schedule();
- __set_current_state(TASK_RUNNING);
remove_wait_queue(>bl_wq, );
if (reply->status != BL_DEVICE_REQUEST_PROC) {
--
2.1.0
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
signature.asc
Description: PGP signature
linux-next: manual merge of the tip tree with the nfs tree
Hi all,
Today's linux-next merge of the tip tree got conflicts in
fs/nfs/blocklayout/blocklayoutdev.c and
fs/nfs/blocklayout/blocklayoutdm.c between commit 871760ce97a9
(pnfs/blocklayout: move all rpc_pipefs related code into a single
file) from the nfs tree and commit f139caf2e897 (sched, cleanup,
treewide: Remove set_current_state(TASK_RUNNING) after schedule())
from the tip tree.
I fixed it up (the former move the code in these two files into
fs/nfs/blocklayout/rpc_pipefs.c, so I deleted the 2 files and applied
the following merge fix patch) and can carry the fix as necessary (no
action is required).
From: Stephen Rothwell s...@canb.auug.org.au
Date: Mon, 22 Sep 2014 13:29:19 +1000
Subject: [PATCH] pnfs: merge fixup for sched cleanup of
set_current_state(TASK_RUNNING)
Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
---
fs/nfs/blocklayout/rpc_pipefs.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/nfs/blocklayout/rpc_pipefs.c b/fs/nfs/blocklayout/rpc_pipefs.c
index 8d04bda2bd2e..e966c023b1b7 100644
--- a/fs/nfs/blocklayout/rpc_pipefs.c
+++ b/fs/nfs/blocklayout/rpc_pipefs.c
@@ -92,7 +92,6 @@ bl_resolve_deviceid(struct nfs_server *server, struct
pnfs_block_volume *b,
set_current_state(TASK_UNINTERRUPTIBLE);
schedule();
- __set_current_state(TASK_RUNNING);
remove_wait_queue(nn-bl_wq, wq);
if (reply-status != BL_DEVICE_REQUEST_PROC) {
--
2.1.0
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
signature.asc
Description: PGP signature
linux-next: manual merge of the tip tree with the nfs tree
Hi all,
Today's linux-next merge of the tip tree got a conflict in
fs/nfs/pagelist.c between commit e7029206ff43 ("nfs: check
wait_on_bit_lock err in page_group_lock") from the nfs tree and commit
743162013d40 ("sched: Remove proliferation of wait_on_bit() action
functions") from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc fs/nfs/pagelist.c
index 9425118e91d7,0be5050638f7..
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@@ -158,14 -149,8 +152,13 @@@ nfs_page_group_lock(struct nfs_page *re
WARN_ON_ONCE(head != head->wb_head);
- wait_on_bit_lock(>wb_flags, PG_HEADLOCK,
+ do {
+ ret = wait_on_bit_lock(>wb_flags, PG_HEADLOCK,
- nfs_wait_bit_uninterruptible,
TASK_UNINTERRUPTIBLE);
+ } while (wait && ret != 0);
+
+ WARN_ON_ONCE(ret > 0);
+ return ret;
}
/*
signature.asc
Description: PGP signature
linux-next: manual merge of the tip tree with the nfs tree
Hi all,
Today's linux-next merge of the tip tree got a conflict in
fs/nfs/pagelist.c between commit e7029206ff43 (nfs: check
wait_on_bit_lock err in page_group_lock) from the nfs tree and commit
743162013d40 (sched: Remove proliferation of wait_on_bit() action
functions) from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc fs/nfs/pagelist.c
index 9425118e91d7,0be5050638f7..
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@@ -158,14 -149,8 +152,13 @@@ nfs_page_group_lock(struct nfs_page *re
WARN_ON_ONCE(head != head-wb_head);
- wait_on_bit_lock(head-wb_flags, PG_HEADLOCK,
+ do {
+ ret = wait_on_bit_lock(head-wb_flags, PG_HEADLOCK,
- nfs_wait_bit_uninterruptible,
TASK_UNINTERRUPTIBLE);
+ } while (wait ret != 0);
+
+ WARN_ON_ONCE(ret 0);
+ return ret;
}
/*
signature.asc
Description: PGP signature
