diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-11 23:35:13 -0400 |
| commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
| tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /fs/nfs/direct.c | |
| parent | b73d884756303316ead4cd7dad51236b2a515a1a (diff) | |
| parent | 86d710146fb9975f04c505ec78caa43d227c1018 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'fs/nfs/direct.c')
| -rw-r--r-- | fs/nfs/direct.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index e4e089a8f294..6c3210099d51 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
| @@ -934,9 +934,6 @@ out: | |||
| 934 | * back into its cache. We let the server do generic write | 934 | * back into its cache. We let the server do generic write |
| 935 | * parameter checking and report problems. | 935 | * parameter checking and report problems. |
| 936 | * | 936 | * |
| 937 | * We also avoid an unnecessary invocation of generic_osync_inode(), | ||
| 938 | * as it is fairly meaningless to sync the metadata of an NFS file. | ||
| 939 | * | ||
| 940 | * We eliminate local atime updates, see direct read above. | 937 | * We eliminate local atime updates, see direct read above. |
| 941 | * | 938 | * |
| 942 | * We avoid unnecessary page cache invalidations for normal cached | 939 | * We avoid unnecessary page cache invalidations for normal cached |