|
@@ -137,11 +137,9 @@ nfs_file_open(struct inode *inode, struct file *filp)
|
|
|
static int
|
|
|
nfs_file_release(struct inode *inode, struct file *filp)
|
|
|
{
|
|
|
- struct dentry *dentry = filp->f_path.dentry;
|
|
|
-
|
|
|
dprintk("NFS: release(%s/%s)\n",
|
|
|
- dentry->d_parent->d_name.name,
|
|
|
- dentry->d_name.name);
|
|
|
+ filp->f_path.dentry->d_parent->d_name.name,
|
|
|
+ filp->f_path.dentry->d_name.name);
|
|
|
|
|
|
nfs_inc_stats(inode, NFSIOS_VFSRELEASE);
|
|
|
return nfs_release(inode, filp);
|
|
@@ -234,14 +232,13 @@ nfs_file_read(struct kiocb *iocb, const struct iovec *iov,
|
|
|
struct dentry * dentry = iocb->ki_filp->f_path.dentry;
|
|
|
struct inode * inode = dentry->d_inode;
|
|
|
ssize_t result;
|
|
|
- size_t count = iov_length(iov, nr_segs);
|
|
|
|
|
|
if (iocb->ki_filp->f_flags & O_DIRECT)
|
|
|
return nfs_file_direct_read(iocb, iov, nr_segs, pos);
|
|
|
|
|
|
dprintk("NFS: read(%s/%s, %lu@%lu)\n",
|
|
|
dentry->d_parent->d_name.name, dentry->d_name.name,
|
|
|
- (unsigned long) count, (unsigned long) pos);
|
|
|
+ (unsigned long) iov_length(iov, nr_segs), (unsigned long) pos);
|
|
|
|
|
|
result = nfs_revalidate_mapping(inode, iocb->ki_filp->f_mapping);
|
|
|
if (!result) {
|