[PATCH 075/124] staging: lustre: recovery: don't replay closed open

[James Simmons]

From: Niu Yawei 

To avoid scanning the replay open list every time in the
ptlrpc_free_committed(), the fix of LU-2613 (4322e0f9) changed
the ptlrpc_free_committed() to skip the open list unless the
import generation is changed. That introduced a race which could
make a closed open being replayed:

1. Application calls ll_close_inode_openhandle()-> mdc_close(),
   to close file, rq_replay is cleared, but the open request is
   still on the imp_committed_list;

2. Before the md_clear_open_replay_data() is called for close,
   client start replay, and that closed open will be replayed
   mistakenly;

3. Open replay interpret callback (mdc_replay_open) could race
   with the mdc_clear_open_replay_data() at the end;

This patch fix the ptlrpc_free_committed() to make sure the
open list is scanned on recovery to prevent the closed open request
from being replayed.

Signed-off-by: Niu Yawei 
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5507
Reviewed-on: http://review.whamcloud.com/12667
Reviewed-by: Lai Siyao 
Reviewed-by: Andreas Dilger 
Reviewed-by: Oleg Drokin 
Signed-off-by: James Simmons 
---
 drivers/staging/lustre/lustre/ptlrpc/client.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c 
b/drivers/staging/lustre/lustre/ptlrpc/client.c
index 27fe00d..a29ccaa 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
@@ -2455,7 +2455,8 @@ void ptlrpc_free_committed(struct obd_import *imp)
   imp->imp_obd->obd_name, imp->imp_peer_committed_transno,
   imp->imp_generation);
 
-   if (imp->imp_generation != imp->imp_last_generation_checked)
+   if (imp->imp_generation != imp->imp_last_generation_checked ||
+   !imp->imp_last_transno_checked)
skip_committed_list = false;
 
imp->imp_last_transno_checked = imp->imp_peer_committed_transno;
@@ -2503,6 +2504,9 @@ free_req:
if (req->rq_import_generation < imp->imp_generation) {
DEBUG_REQ(D_RPCTRACE, req, "free stale open request");
ptlrpc_free_request(req);
+   } else if (!req->rq_replay) {
+   DEBUG_REQ(D_RPCTRACE, req, "free closed open request");
+   ptlrpc_free_request(req);
}
}
 }
-- 
1.7.1

[PATCH 075/124] staging: lustre: recovery: don't replay closed open

[James Simmons]

From: Niu Yawei 

To avoid scanning the replay open list every time in the
ptlrpc_free_committed(), the fix of LU-2613 (4322e0f9) changed
the ptlrpc_free_committed() to skip the open list unless the
import generation is changed. That introduced a race which could
make a closed open being replayed:

1. Application calls ll_close_inode_openhandle()-> mdc_close(),
   to close file, rq_replay is cleared, but the open request is
   still on the imp_committed_list;

2. Before the md_clear_open_replay_data() is called for close,
   client start replay, and that closed open will be replayed
   mistakenly;

3. Open replay interpret callback (mdc_replay_open) could race
   with the mdc_clear_open_replay_data() at the end;

This patch fix the ptlrpc_free_committed() to make sure the
open list is scanned on recovery to prevent the closed open request
from being replayed.

Signed-off-by: Niu Yawei 
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5507
Reviewed-on: http://review.whamcloud.com/12667
Reviewed-by: Lai Siyao 
Reviewed-by: Andreas Dilger 
Reviewed-by: Oleg Drokin 
Signed-off-by: James Simmons 
---
 drivers/staging/lustre/lustre/ptlrpc/client.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c 
b/drivers/staging/lustre/lustre/ptlrpc/client.c
index 27fe00d..a29ccaa 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/client.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
@@ -2455,7 +2455,8 @@ void ptlrpc_free_committed(struct obd_import *imp)
   imp->imp_obd->obd_name, imp->imp_peer_committed_transno,
   imp->imp_generation);
 
-   if (imp->imp_generation != imp->imp_last_generation_checked)
+   if (imp->imp_generation != imp->imp_last_generation_checked ||
+   !imp->imp_last_transno_checked)
skip_committed_list = false;
 
imp->imp_last_transno_checked = imp->imp_peer_committed_transno;
@@ -2503,6 +2504,9 @@ free_req:
if (req->rq_import_generation < imp->imp_generation) {
DEBUG_REQ(D_RPCTRACE, req, "free stale open request");
ptlrpc_free_request(req);
+   } else if (!req->rq_replay) {
+   DEBUG_REQ(D_RPCTRACE, req, "free closed open request");
+   ptlrpc_free_request(req);
}
}
 }
-- 
1.7.1