On Mon, 2017-11-20 at 16:43 -0500, Scott Mayhew wrote:
> Otherwise nfs_commit_inode() can set I_DIRTY_DATASYNC in the inode's
> i_state, allowing the following BUG_ON in evict() to be triggered:
>
> BUG_ON(inode->i_state != (I_FREEING | I_CLEAR));
>
> Fixes: 1f18b82c3437 ("pNFS: Ensure we commit the layout if it has
> been...")
> Signed-off-by: Scott Mayhew <smayhew@xxxxxxxxxx>
> Tested-by: Tigran Mkrtchyan <tigran.mkrtchyan@xxxxxxx>
> ---
> fs/nfs/filelayout/filelayout.c | 2 +-
> fs/nfs/flexfilelayout/flexfilelayout.c | 2 +-
> fs/nfs/nfs4super.c | 2 +-
> fs/nfs/pnfs.c | 6 +++---
> fs/nfs/pnfs.h | 2 +-
> 5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/fs/nfs/filelayout/filelayout.c
> b/fs/nfs/filelayout/filelayout.c
> index 4e54d8b..28b7228 100644
> --- a/fs/nfs/filelayout/filelayout.c
> +++ b/fs/nfs/filelayout/filelayout.c
> @@ -169,7 +169,7 @@ static int filelayout_async_handle_error(struct
> rpc_task *task,
> * i/o and all i/o waiting on the slot table to the
> MDS until
> * layout is destroyed and a new valid layout is
> obtained.
> */
> - pnfs_destroy_layout(NFS_I(inode));
> + pnfs_destroy_layout(NFS_I(inode), 0);
> rpc_wake_up(&tbl->slot_tbl_waitq);
> goto reset;
> /* RPC connection errors */
> diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c
> b/fs/nfs/flexfilelayout/flexfilelayout.c
> index c75ad98..ab0a1e5 100644
> --- a/fs/nfs/flexfilelayout/flexfilelayout.c
> +++ b/fs/nfs/flexfilelayout/flexfilelayout.c
> @@ -1088,7 +1088,7 @@ static int
> ff_layout_async_handle_error_v4(struct rpc_task *task,
> * i/o and all i/o waiting on the slot table to the
> MDS until
> * layout is destroyed and a new valid layout is
> obtained.
> */
> - pnfs_destroy_layout(NFS_I(inode));
> + pnfs_destroy_layout(NFS_I(inode), 0);
> rpc_wake_up(&tbl->slot_tbl_waitq);
> goto reset;
> /* RPC connection errors */
> diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
> index 6fb7cb6..3b4a063 100644
> --- a/fs/nfs/nfs4super.c
> +++ b/fs/nfs/nfs4super.c
> @@ -95,7 +95,7 @@ static void nfs4_evict_inode(struct inode *inode)
> nfs_inode_return_delegation_noreclaim(inode);
> /* Note that above delegreturn would trigger pnfs return-on-
> close */
> pnfs_return_layout(inode);
> - pnfs_destroy_layout(NFS_I(inode));
> + pnfs_destroy_layout(NFS_I(inode), FLUSH_SYNC);
> /* First call standard NFS clear_inode() code */
> nfs_clear_inode(inode);
> }
>
NACK. If you still have dirty pages when you get to nfs4_evict_inode(),
then you are screwed no matter what.
This problem should be fixable in nfs_commit_inode() by simply exiting
after the call to nfs_commit_end() if res == 0.
--
Trond Myklebust
Linux NFS client maintainer, PrimaryData
trond.myklebust@xxxxxxxxxxxxxxx
��.n��������+%������w��{.n�����{��w��� jg��� �����ݢj����G���� ���j:+v���w�m������w�������h�����٥
