From d976c2d4eb8d3bb2ee7f3fb36c93b95588a1bd4a Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 1 Feb 2010 14:17:50 -0500
Subject: [PATCH] --- yaml --- r: 186151 b: refs/heads/master c:
 f895c53f8ace3c3e49ebf9def90e63fc6d46d2bf h: refs/heads/master i:   186149:
 cbfb7af106f85e35c795a7471d62b861aa818284   186147:
 fd17e66895859283eabb845bec4ccff6318752d3   186143:
 ede42e3dfebb872c3fe055af6fd5505e2f5cf24b v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/inode.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 924b589fdb77..efd577295d94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e381172cf6e0282a56374e50667515aed55166a
+refs/heads/master: f895c53f8ace3c3e49ebf9def90e63fc6d46d2bf
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index f141bde7756a..87cca56846d6 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -620,11 +620,6 @@ void put_nfs_open_context(struct nfs_open_context *ctx)
 	__put_nfs_open_context(ctx, 0);
 }
 
-static void put_nfs_open_context_sync(struct nfs_open_context *ctx)
-{
-	__put_nfs_open_context(ctx, 1);
-}
-
 /*
  * Ensure that mmap has a recent RPC credential for use when writing out
  * shared pages
@@ -671,7 +666,7 @@ static void nfs_file_clear_open_context(struct file *filp)
 		spin_lock(&inode->i_lock);
 		list_move_tail(&ctx->list, &NFS_I(inode)->open_files);
 		spin_unlock(&inode->i_lock);
-		put_nfs_open_context_sync(ctx);
+		__put_nfs_open_context(ctx, filp->f_flags & O_DIRECT ? 0 : 1);
 	}
 }