summaryrefslogtreecommitdiff
path: root/fs/nfs/direct.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-06-22 17:35:06 -0700
committerSteve French <sfrench@hera.kernel.org>2005-06-22 17:35:06 -0700
commit1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (patch)
tree7741cfd476f9c622a10c198da421fdb3e38708b9 /fs/nfs/direct.c
parentac67055ef2378ea95c34b593ddf9d0a0737a240a (diff)
parenta4936044001694f033fe4ea94d6034d51a6b465c (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r--fs/nfs/direct.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 68df803f27c..d6a30c844de 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -517,7 +517,7 @@ retry:
result = tot_bytes;
out:
- nfs_end_data_update_defer(inode);
+ nfs_end_data_update(inode);
nfs_writedata_free(wdata);
return result;