[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>
This commit is contained in:

committed by
Linus Torvalds

parent
2485822d51
commit
01cce933d8
@@ -176,7 +176,7 @@ static int
|
||||
nfs_file_flush(struct file *file, fl_owner_t id)
|
||||
{
|
||||
struct nfs_open_context *ctx = (struct nfs_open_context *)file->private_data;
|
||||
struct inode *inode = file->f_dentry->d_inode;
|
||||
struct inode *inode = file->f_path.dentry->d_inode;
|
||||
int status;
|
||||
|
||||
dfprintk(VFS, "nfs: flush(%s/%ld)\n", inode->i_sb->s_id, inode->i_ino);
|
||||
@@ -201,7 +201,7 @@ static ssize_t
|
||||
nfs_file_read(struct kiocb *iocb, const struct iovec *iov,
|
||||
unsigned long nr_segs, loff_t pos)
|
||||
{
|
||||
struct dentry * dentry = iocb->ki_filp->f_dentry;
|
||||
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);
|
||||
@@ -226,7 +226,7 @@ static ssize_t
|
||||
nfs_file_sendfile(struct file *filp, loff_t *ppos, size_t count,
|
||||
read_actor_t actor, void *target)
|
||||
{
|
||||
struct dentry *dentry = filp->f_dentry;
|
||||
struct dentry *dentry = filp->f_path.dentry;
|
||||
struct inode *inode = dentry->d_inode;
|
||||
ssize_t res;
|
||||
|
||||
@@ -243,7 +243,7 @@ nfs_file_sendfile(struct file *filp, loff_t *ppos, size_t count,
|
||||
static int
|
||||
nfs_file_mmap(struct file * file, struct vm_area_struct * vma)
|
||||
{
|
||||
struct dentry *dentry = file->f_dentry;
|
||||
struct dentry *dentry = file->f_path.dentry;
|
||||
struct inode *inode = dentry->d_inode;
|
||||
int status;
|
||||
|
||||
@@ -343,7 +343,7 @@ const struct address_space_operations nfs_file_aops = {
|
||||
static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov,
|
||||
unsigned long nr_segs, loff_t pos)
|
||||
{
|
||||
struct dentry * dentry = iocb->ki_filp->f_dentry;
|
||||
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);
|
||||
@@ -535,8 +535,8 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
|
||||
static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)
|
||||
{
|
||||
dprintk("NFS: nfs_flock(f=%s/%ld, t=%x, fl=%x)\n",
|
||||
filp->f_dentry->d_inode->i_sb->s_id,
|
||||
filp->f_dentry->d_inode->i_ino,
|
||||
filp->f_path.dentry->d_inode->i_sb->s_id,
|
||||
filp->f_path.dentry->d_inode->i_ino,
|
||||
fl->fl_type, fl->fl_flags);
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user