aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/direct.c
diff options
context:
space:
mode:
authorJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>2006-12-08 05:36:40 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:41 -0500
commit01cce933d8b524d9312f5098c70fa1b6ac190572 (patch)
tree7601e02e874a6eb44faca3cdf06664c7377ac687 /fs/nfs/direct.c
parent2485822d51f8b338d289abe00eb7ce5249794a08 (diff)
[PATCH] nfs: change uses of f_{dentry,vfsmnt} to use f_path
Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the nfs client code. Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r--fs/nfs/direct.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index f9d678f4ae06..bd21d7fde650 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -116,7 +116,7 @@ static inline int put_dreq(struct nfs_direct_req *dreq)
116ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs) 116ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs)
117{ 117{
118 dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n", 118 dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n",
119 iocb->ki_filp->f_dentry->d_name.name, 119 iocb->ki_filp->f_path.dentry->d_name.name,
120 (long long) pos, nr_segs); 120 (long long) pos, nr_segs);
121 121
122 return -EINVAL; 122 return -EINVAL;
@@ -734,8 +734,8 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov,
734 size_t count = iov[0].iov_len; 734 size_t count = iov[0].iov_len;
735 735
736 dprintk("nfs: direct read(%s/%s, %lu@%Ld)\n", 736 dprintk("nfs: direct read(%s/%s, %lu@%Ld)\n",
737 file->f_dentry->d_parent->d_name.name, 737 file->f_path.dentry->d_parent->d_name.name,
738 file->f_dentry->d_name.name, 738 file->f_path.dentry->d_name.name,
739 (unsigned long) count, (long long) pos); 739 (unsigned long) count, (long long) pos);
740 740
741 if (nr_segs != 1) 741 if (nr_segs != 1)
@@ -798,8 +798,8 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
798 size_t count = iov[0].iov_len; 798 size_t count = iov[0].iov_len;
799 799
800 dfprintk(VFS, "nfs: direct write(%s/%s, %lu@%Ld)\n", 800 dfprintk(VFS, "nfs: direct write(%s/%s, %lu@%Ld)\n",
801 file->f_dentry->d_parent->d_name.name, 801 file->f_path.dentry->d_parent->d_name.name,
802 file->f_dentry->d_name.name, 802 file->f_path.dentry->d_name.name,
803 (unsigned long) count, (long long) pos); 803 (unsigned long) count, (long long) pos);
804 804
805 if (nr_segs != 1) 805 if (nr_segs != 1)