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

Commit a67f797d authored by Al Viro's avatar Al Viro
Browse files

ncpfs: use file_inode() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b583043e

fs/ncpfs/dir.c

+2 −4
Original line number Diff line number Diff line
@@ -685,8 +685,7 @@ static void 
ncp_read_volume_list(struct file *file, struct dir_context *ctx,

			struct ncp_cache_control *ctl)

{

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

	struct inode *inode = dentry->d_inode;

	struct inode *inode = file_inode(file);

	struct ncp_server *server = NCP_SERVER(inode);

	struct ncp_volume_info info;

	struct ncp_entry_info entry;
@@ -721,8 +720,7 @@ static void 
ncp_do_readdir(struct file *file, struct dir_context *ctx,

						struct ncp_cache_control *ctl)

{

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

	struct inode *dir = dentry->d_inode;

	struct inode *dir = file_inode(file);

	struct ncp_server *server = NCP_SERVER(dir);

	struct nw_search_sequence seq;

	struct ncp_entry_info entry;

fs/ncpfs/file.c

+6 −8
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ out: 
static ssize_t

ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)

{

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

	struct inode *inode = dentry->d_inode;

	struct inode *inode = file_inode(file);

	size_t already_read = 0;

	off_t pos;

	size_t bufsize;
@@ -109,7 +108,7 @@ ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) 
	void* freepage;

	size_t freelen;



	ncp_dbg(1, "enter %pd2\n", dentry);

	ncp_dbg(1, "enter %pD2\n", file);



	pos = *ppos;
@@ -167,7 +166,7 @@ ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) 


	file_accessed(file);



	ncp_dbg(1, "exit %pd2\n", dentry);

	ncp_dbg(1, "exit %pD2\n", file);

outrel:

	ncp_inode_close(inode);		

	return already_read ? already_read : error;
@@ -176,15 +175,14 @@ outrel: 
static ssize_t

ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)

{

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

	struct inode *inode = dentry->d_inode;

	struct inode *inode = file_inode(file);

	size_t already_written = 0;

	off_t pos;

	size_t bufsize;

	int errno;

	void* bouncebuffer;



	ncp_dbg(1, "enter %pd2\n", dentry);

	ncp_dbg(1, "enter %pD2\n", file);

	if ((ssize_t) count < 0)

		return -EINVAL;

	pos = *ppos;
@@ -263,7 +261,7 @@ ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t * 
			i_size_write(inode, pos);

		mutex_unlock(&inode->i_mutex);

	}

	ncp_dbg(1, "exit %pd2\n", dentry);

	ncp_dbg(1, "exit %pD2\n", file);

outrel:

	ncp_inode_close(inode);		

	return already_written ? already_written : errno;

fs/ncpfs/mmap.c

+1 −3
Original line number Diff line number Diff line
@@ -30,9 +30,7 @@ 
static int ncp_file_mmap_fault(struct vm_area_struct *area,

					struct vm_fault *vmf)

{

	struct file *file = area->vm_file;

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

	struct inode *inode = dentry->d_inode;

	struct inode *inode = file_inode(area->vm_file);

	char *pg_addr;

	unsigned int already_read;

	unsigned int count;