aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/dir.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-08-10 17:44:32 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:18:31 -0400
commitcd3758e37ddea66fccca7d93c4b601e8a2e51926 (patch)
tree07566d3ee457524a97b534a4f214b9178b1278c8 /fs/nfs/dir.c
parentc03025d55540bd648f2546659090140ecc835572 (diff)
NFS: Replace file->private_data with calls to nfs_file_open_context()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r--fs/nfs/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index dde545925b4e..b332c527d95d 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -558,7 +558,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
558 memset(desc, 0, sizeof(*desc)); 558 memset(desc, 0, sizeof(*desc));
559 559
560 desc->file = filp; 560 desc->file = filp;
561 desc->dir_cookie = &((struct nfs_open_context *)filp->private_data)->dir_cookie; 561 desc->dir_cookie = &nfs_file_open_context(filp)->dir_cookie;
562 desc->decode = NFS_PROTO(inode)->decode_dirent; 562 desc->decode = NFS_PROTO(inode)->decode_dirent;
563 desc->plus = NFS_USE_READDIRPLUS(inode); 563 desc->plus = NFS_USE_READDIRPLUS(inode);
564 564
@@ -623,7 +623,7 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)
623 } 623 }
624 if (offset != filp->f_pos) { 624 if (offset != filp->f_pos) {
625 filp->f_pos = offset; 625 filp->f_pos = offset;
626 ((struct nfs_open_context *)filp->private_data)->dir_cookie = 0; 626 nfs_file_open_context(filp)->dir_cookie = 0;
627 } 627 }
628out: 628out:
629 mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex); 629 mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex);