From 7c0ac81486a1b63cfb8ec44b4bfb98c5c4c3254a Mon Sep 17 00:00:00 2001 From: Fred Isaman Date: Fri, 8 Jun 2012 16:48:33 -0400 Subject: [PATCH] --- yaml --- r: 310955 b: refs/heads/master c: 906369e43c29001c39c7dfed8a01b9dff24ace75 h: refs/heads/master i: 310953: 634bac211a4d42ff59ba822cb7b5e997ccab37c1 310951: 6fc0b626eb566b3de9310539bf2d6946b18b865b v: v3 --- [refs] | 2 +- trunk/fs/nfs/direct.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b1fb8893f948..cc91192ca92a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d0dbc6ae8a5194aaecb9cfffb9053f38fce8b86 +refs/heads/master: 906369e43c29001c39c7dfed8a01b9dff24ace75 diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c index b5385a7efd56..05099890a929 100644 --- a/trunk/fs/nfs/direct.c +++ b/trunk/fs/nfs/direct.c @@ -517,9 +517,9 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data) nfs_list_remove_request(req); if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES) { /* Note the rewrite will go through mds */ - kref_get(&req->wb_kref); nfs_mark_request_commit(req, NULL, &cinfo); - } + } else + nfs_release_request(req); nfs_unlock_and_release_request(req); }