aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r--fs/nfs/file.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index ef57a5ae5904..10e8b807e7ff 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -234,10 +234,8 @@ nfs_file_read(struct kiocb *iocb, const struct iovec *iov,
234 ssize_t result; 234 ssize_t result;
235 size_t count = iov_length(iov, nr_segs); 235 size_t count = iov_length(iov, nr_segs);
236 236
237#ifdef CONFIG_NFS_DIRECTIO
238 if (iocb->ki_filp->f_flags & O_DIRECT) 237 if (iocb->ki_filp->f_flags & O_DIRECT)
239 return nfs_file_direct_read(iocb, iov, nr_segs, pos); 238 return nfs_file_direct_read(iocb, iov, nr_segs, pos);
240#endif
241 239
242 dfprintk(VFS, "nfs: read(%s/%s, %lu@%lu)\n", 240 dfprintk(VFS, "nfs: read(%s/%s, %lu@%lu)\n",
243 dentry->d_parent->d_name.name, dentry->d_name.name, 241 dentry->d_parent->d_name.name, dentry->d_name.name,
@@ -383,9 +381,7 @@ const struct address_space_operations nfs_file_aops = {
383 .write_end = nfs_write_end, 381 .write_end = nfs_write_end,
384 .invalidatepage = nfs_invalidate_page, 382 .invalidatepage = nfs_invalidate_page,
385 .releasepage = nfs_release_page, 383 .releasepage = nfs_release_page,
386#ifdef CONFIG_NFS_DIRECTIO
387 .direct_IO = nfs_direct_IO, 384 .direct_IO = nfs_direct_IO,
388#endif
389 .launder_page = nfs_launder_page, 385 .launder_page = nfs_launder_page,
390}; 386};
391 387
@@ -443,10 +439,8 @@ static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov,
443 ssize_t result; 439 ssize_t result;
444 size_t count = iov_length(iov, nr_segs); 440 size_t count = iov_length(iov, nr_segs);
445 441
446#ifdef CONFIG_NFS_DIRECTIO
447 if (iocb->ki_filp->f_flags & O_DIRECT) 442 if (iocb->ki_filp->f_flags & O_DIRECT)
448 return nfs_file_direct_write(iocb, iov, nr_segs, pos); 443 return nfs_file_direct_write(iocb, iov, nr_segs, pos);
449#endif
450 444
451 dfprintk(VFS, "nfs: write(%s/%s(%ld), %lu@%Ld)\n", 445 dfprintk(VFS, "nfs: write(%s/%s(%ld), %lu@%Ld)\n",
452 dentry->d_parent->d_name.name, dentry->d_name.name, 446 dentry->d_parent->d_name.name, dentry->d_name.name,