aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/direct.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 17:32:15 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 17:32:15 -0400
commit9092131f7ea2f9e92a510ae13ac4d20165aa921c (patch)
tree4bcac80a227d320b69454057cdcef41ef43c6c85 /fs/nfs/direct.c
parentf1b04770b0d073a9d70e5b3b873d274c1c19e1f6 (diff)
parenteadf4598e7ec37a234e70e965bd335860e58bda4 (diff)
Merge rsync://client.linux-nfs.org/pub/linux/nfs-2.6
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 68df803f27ca..d6a30c844de3 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -517,7 +517,7 @@ retry:
517 result = tot_bytes; 517 result = tot_bytes;
518 518
519out: 519out:
520 nfs_end_data_update_defer(inode); 520 nfs_end_data_update(inode);
521 nfs_writedata_free(wdata); 521 nfs_writedata_free(wdata);
522 return result; 522 return result;
523 523