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

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

[PATCH] 9p: 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 9p
filesystem.

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 d3ac7f89

fs/9p/vfs_addr.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int v9fs_vfs_readpage(struct file *filp, struct page *page) 
	int retval = -EIO;

	loff_t offset = page_offset(page);

	int count = PAGE_CACHE_SIZE;

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

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

	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);

	int rsize = v9ses->maxdata - V9FS_IOHDRSZ;

	struct v9fs_fid *v9f = filp->private_data;

fs/9p/vfs_dir.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static inline int dt_type(struct v9fs_stat *mistat) 
static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)

{

	struct v9fs_fcall *fcall = NULL;

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

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

	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);

	struct v9fs_fid *file = filp->private_data;

	unsigned int i, n, s;
@@ -80,7 +80,7 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	struct v9fs_stat stat;

	int over = 0;



	dprintk(DEBUG_VFS, "name %s\n", filp->f_dentry->d_name.name);

	dprintk(DEBUG_VFS, "name %s\n", filp->f_path.dentry->d_name.name);



	fid = file->fid;

fs/9p/vfs_file.c

+4 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) 


	dprintk(DEBUG_VFS, "inode: %p file: %p \n", inode, file);



	vfid = v9fs_fid_lookup(file->f_dentry);

	vfid = v9fs_fid_lookup(file->f_path.dentry);

	if (!vfid) {

		dprintk(DEBUG_ERROR, "Couldn't resolve fid from dentry\n");

		return -EBADF;
@@ -133,7 +133,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) 
static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl)

{

	int res = 0;

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

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



	dprintk(DEBUG_VFS, "filp: %p lock: %p\n", filp, fl);
@@ -161,7 +161,7 @@ static ssize_t 
v9fs_file_read(struct file *filp, char __user * data, size_t count,

	       loff_t * offset)

{

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

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

	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);

	struct v9fs_fid *v9f = filp->private_data;

	struct v9fs_fcall *fcall = NULL;
@@ -225,7 +225,7 @@ static ssize_t 
v9fs_file_write(struct file *filp, const char __user * data,

		size_t count, loff_t * offset)

{

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

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

	struct v9fs_session_info *v9ses = v9fs_inode2v9ses(inode);

	struct v9fs_fid *v9fid = filp->private_data;

	struct v9fs_fcall *fcall;