---

yaml --- r: 186151 b: refs/heads/master c: f895c53 h: refs/heads/master i: 186149: cbfb7af 186147: fd17e66 186143: ede42e3 v: v3
git-mirror · Feb 10, 2010 · d976c2d · d976c2d
1 parent bce8f24
commit d976c2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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);
 	}
 }