diff options
Diffstat (limited to 'fs/nfs/direct.c')
| -rw-r--r-- | fs/nfs/direct.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 91ff089d3412..d71d66c9e0a1 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
| @@ -124,9 +124,8 @@ static inline int put_dreq(struct nfs_direct_req *dreq) | |||
| 124 | ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs) | 124 | ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs) |
| 125 | { | 125 | { |
| 126 | #ifndef CONFIG_NFS_SWAP | 126 | #ifndef CONFIG_NFS_SWAP |
| 127 | dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n", | 127 | dprintk("NFS: nfs_direct_IO (%pD) off/no(%Ld/%lu) EINVAL\n", |
| 128 | iocb->ki_filp->f_path.dentry->d_name.name, | 128 | iocb->ki_filp, (long long) pos, nr_segs); |
| 129 | (long long) pos, nr_segs); | ||
| 130 | 129 | ||
| 131 | return -EINVAL; | 130 | return -EINVAL; |
| 132 | #else | 131 | #else |
| @@ -909,10 +908,8 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov, | |||
| 909 | count = iov_length(iov, nr_segs); | 908 | count = iov_length(iov, nr_segs); |
| 910 | nfs_add_stats(mapping->host, NFSIOS_DIRECTREADBYTES, count); | 909 | nfs_add_stats(mapping->host, NFSIOS_DIRECTREADBYTES, count); |
| 911 | 910 | ||
| 912 | dfprintk(FILE, "NFS: direct read(%s/%s, %zd@%Ld)\n", | 911 | dfprintk(FILE, "NFS: direct read(%pD2, %zd@%Ld)\n", |
| 913 | file->f_path.dentry->d_parent->d_name.name, | 912 | file, count, (long long) pos); |
| 914 | file->f_path.dentry->d_name.name, | ||
| 915 | count, (long long) pos); | ||
| 916 | 913 | ||
| 917 | retval = 0; | 914 | retval = 0; |
| 918 | if (!count) | 915 | if (!count) |
| @@ -965,10 +962,8 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov, | |||
| 965 | count = iov_length(iov, nr_segs); | 962 | count = iov_length(iov, nr_segs); |
| 966 | nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES, count); | 963 | nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES, count); |
| 967 | 964 | ||
| 968 | dfprintk(FILE, "NFS: direct write(%s/%s, %zd@%Ld)\n", | 965 | dfprintk(FILE, "NFS: direct write(%pD2, %zd@%Ld)\n", |
| 969 | file->f_path.dentry->d_parent->d_name.name, | 966 | file, count, (long long) pos); |
| 970 | file->f_path.dentry->d_name.name, | ||
| 971 | count, (long long) pos); | ||
| 972 | 967 | ||
| 973 | retval = generic_write_checks(file, &pos, &count, 0); | 968 | retval = generic_write_checks(file, &pos, &count, 0); |
| 974 | if (retval) | 969 | if (retval) |
