Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01cce933 authored by Josef "Jeff" Sipek's avatar Josef "Jeff" Sipek Committed by Linus Torvalds
Browse files

[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: default avatarJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2485822d

fs/nfs/dir.c

+9 −9
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static 
int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)

{

	struct file	*file = desc->file;

	struct inode	*inode = file->f_dentry->d_inode;

	struct inode	*inode = file->f_path.dentry->d_inode;

	struct rpc_cred	*cred = nfs_file_cred(file);

	unsigned long	timestamp;

	int		error;
@@ -183,7 +183,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page) 


 again:

	timestamp = jiffies;

	error = NFS_PROTO(inode)->readdir(file->f_dentry, cred, desc->entry->cookie, page,

	error = NFS_PROTO(inode)->readdir(file->f_path.dentry, cred, desc->entry->cookie, page,

					  NFS_SERVER(inode)->dtsize, desc->plus);

	if (error < 0) {

		/* We requested READDIRPLUS, but the server doesn't grok it */
@@ -308,7 +308,7 @@ int find_dirent_index(nfs_readdir_descriptor_t *desc) 
static inline

int find_dirent_page(nfs_readdir_descriptor_t *desc)

{

	struct inode	*inode = desc->file->f_dentry->d_inode;

	struct inode	*inode = desc->file->f_path.dentry->d_inode;

	struct page	*page;

	int		status;
@@ -464,7 +464,7 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, 
		     filldir_t filldir)

{

	struct file	*file = desc->file;

	struct inode	*inode = file->f_dentry->d_inode;

	struct inode	*inode = file->f_path.dentry->d_inode;

	struct rpc_cred	*cred = nfs_file_cred(file);

	struct page	*page = NULL;

	int		status;
@@ -477,7 +477,7 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, 
		status = -ENOMEM;

		goto out;

	}

	desc->error = NFS_PROTO(inode)->readdir(file->f_dentry, cred, *desc->dir_cookie,

	desc->error = NFS_PROTO(inode)->readdir(file->f_path.dentry, cred, *desc->dir_cookie,

						page,

						NFS_SERVER(inode)->dtsize,

						desc->plus);
@@ -516,7 +516,7 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, 
 */

static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir)

{

	struct dentry	*dentry = filp->f_dentry;

	struct dentry	*dentry = filp->f_path.dentry;

	struct inode	*inode = dentry->d_inode;

	nfs_readdir_descriptor_t my_desc,

			*desc = &my_desc;
@@ -599,7 +599,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 


loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin)

{

	mutex_lock(&filp->f_dentry->d_inode->i_mutex);

	mutex_lock(&filp->f_path.dentry->d_inode->i_mutex);

	switch (origin) {

		case 1:

			offset += filp->f_pos;
@@ -615,7 +615,7 @@ loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin) 
		((struct nfs_open_context *)filp->private_data)->dir_cookie = 0;

	}

out:

	mutex_unlock(&filp->f_dentry->d_inode->i_mutex);

	mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex);

	return offset;

}
@@ -1102,7 +1102,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd) 


static struct dentry *nfs_readdir_lookup(nfs_readdir_descriptor_t *desc)

{

	struct dentry *parent = desc->file->f_dentry;

	struct dentry *parent = desc->file->f_path.dentry;

	struct inode *dir = parent->d_inode;

	struct nfs_entry *entry = desc->entry;

	struct dentry *dentry, *alias;

fs/nfs/direct.c

+5 −5
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static inline int put_dreq(struct nfs_direct_req *dreq) 
ssize_t nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, loff_t pos, unsigned long nr_segs)

{

	dprintk("NFS: nfs_direct_IO (%s) off/no(%Ld/%lu) EINVAL\n",

			iocb->ki_filp->f_dentry->d_name.name,

			iocb->ki_filp->f_path.dentry->d_name.name,

			(long long) pos, nr_segs);



	return -EINVAL;
@@ -734,8 +734,8 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov, 
	size_t count = iov[0].iov_len;



	dprintk("nfs: direct read(%s/%s, %lu@%Ld)\n",

		file->f_dentry->d_parent->d_name.name,

		file->f_dentry->d_name.name,

		file->f_path.dentry->d_parent->d_name.name,

		file->f_path.dentry->d_name.name,

		(unsigned long) count, (long long) pos);



	if (nr_segs != 1)
@@ -798,8 +798,8 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov, 
	size_t count = iov[0].iov_len;



	dfprintk(VFS, "nfs: direct write(%s/%s, %lu@%Ld)\n",

		file->f_dentry->d_parent->d_name.name,

		file->f_dentry->d_name.name,

		file->f_path.dentry->d_parent->d_name.name,

		file->f_path.dentry->d_name.name,

		(unsigned long) count, (long long) pos);



	if (nr_segs != 1)

fs/nfs/file.c

+7 −7
Original line number Diff line number Diff line
@@ -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);



	/*

fs/nfs/idmap.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ idmap_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg, 
static ssize_t

idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)

{

        struct rpc_inode *rpci = RPC_I(filp->f_dentry->d_inode);

        struct rpc_inode *rpci = RPC_I(filp->f_path.dentry->d_inode);

	struct idmap *idmap = (struct idmap *)rpci->private;

	struct idmap_msg im_in, *im = &idmap->idmap_im;

	struct idmap_hashtable *h;

fs/nfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ void put_nfs_open_context(struct nfs_open_context *ctx) 
 */

static void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx)

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct nfs_inode *nfsi = NFS_I(inode);



	filp->private_data = get_nfs_open_context(ctx);
@@ -528,7 +528,7 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_c 


static void nfs_file_clear_open_context(struct file *filp)

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct nfs_open_context *ctx = (struct nfs_open_context *)filp->private_data;



	if (ctx) {
@@ -551,7 +551,7 @@ int nfs_open(struct inode *inode, struct file *filp) 
	cred = rpcauth_lookupcred(NFS_CLIENT(inode)->cl_auth, 0);

	if (IS_ERR(cred))

		return PTR_ERR(cred);

	ctx = alloc_nfs_open_context(filp->f_vfsmnt, filp->f_dentry, cred);

	ctx = alloc_nfs_open_context(filp->f_path.mnt, filp->f_path.dentry, cred);

	put_rpccred(cred);

	if (ctx == NULL)

		return -ENOMEM;