Commit 92e5baef authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert ncpfs 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 17506041

fs/ncpfs/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static time_t ncp_obtain_mtime(struct dentry *dentry) 


static int ncp_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;

	struct page *page = NULL;

	struct ncp_server *server = NCP_SERVER(inode);
@@ -554,7 +554,7 @@ static int 
ncp_fill_cache(struct file *filp, void *dirent, filldir_t filldir,

		struct ncp_cache_control *ctrl, struct ncp_entry_info *entry)

{

	struct dentry *newdent, *dentry = filp->f_dentry;

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

	struct inode *newino, *inode = dentry->d_inode;

	struct ncp_cache_control ctl = *ctrl;

	struct qstr qname;
@@ -649,7 +649,7 @@ static void 
ncp_read_volume_list(struct file *filp, void *dirent, filldir_t filldir,

			struct ncp_cache_control *ctl)

{

	struct dentry *dentry = filp->f_dentry;

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

	struct inode *inode = dentry->d_inode;

	struct ncp_server *server = NCP_SERVER(inode);

	struct ncp_volume_info info;
@@ -685,7 +685,7 @@ static void 
ncp_do_readdir(struct file *filp, void *dirent, filldir_t filldir,

						struct ncp_cache_control *ctl)

{

	struct dentry *dentry = filp->f_dentry;

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

	struct inode *dir = dentry->d_inode;

	struct ncp_server *server = NCP_SERVER(dir);

	struct nw_search_sequence seq;

fs/ncpfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,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_dentry;

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

	struct inode *inode = dentry->d_inode;

	size_t already_read = 0;

	off_t pos;
@@ -182,7 +182,7 @@ 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_dentry;

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

	struct inode *inode = dentry->d_inode;

	size_t already_written = 0;

	off_t pos;

fs/ncpfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) 
	if (!ncp_filp)

		goto out;

	error = -ENOTSOCK;

	sock_inode = ncp_filp->f_dentry->d_inode;

	sock_inode = ncp_filp->f_path.dentry->d_inode;

	if (!S_ISSOCK(sock_inode->i_mode))

		goto out_fput;

	sock = SOCKET_I(sock_inode);
@@ -504,7 +504,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) 
		if (!server->info_filp)

			goto out_fput;

		error = -ENOTSOCK;

		sock_inode = server->info_filp->f_dentry->d_inode;

		sock_inode = server->info_filp->f_path.dentry->d_inode;

		if (!S_ISSOCK(sock_inode->i_mode))

			goto out_fput2;

		info_sock = SOCKET_I(sock_inode);

fs/ncpfs/ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static int 
ncp_get_fs_info(struct ncp_server * server, struct file *file,

		struct ncp_fs_info __user *arg)

{

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

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

	struct ncp_fs_info info;



	if ((file_permission(file, MAY_WRITE) != 0)
@@ -65,7 +65,7 @@ static int 
ncp_get_fs_info_v2(struct ncp_server * server, struct file *file,

		   struct ncp_fs_info_v2 __user * arg)

{

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

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

	struct ncp_fs_info_v2 info2;



	if ((file_permission(file, MAY_WRITE) != 0)
@@ -136,7 +136,7 @@ static int 
ncp_get_compat_fs_info_v2(struct ncp_server * server, struct file *file,

		   struct compat_ncp_fs_info_v2 __user * arg)

{

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

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

	struct compat_ncp_fs_info_v2 info2;



	if ((file_permission(file, MAY_WRITE) != 0)
@@ -824,7 +824,7 @@ outrel: 
#ifdef CONFIG_COMPAT

long ncp_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

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

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

	int ret;



	lock_kernel();

fs/ncpfs/mmap.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area, 
				     unsigned long address, int *type)

{

	struct file *file = area->vm_file;

	struct dentry *dentry = file->f_dentry;

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

	struct inode *inode = dentry->d_inode;

	struct page* page;

	char *pg_addr;
@@ -106,7 +106,7 @@ static struct vm_operations_struct ncp_file_mmap = 
/* This is used for a general mmap of a ncp file */

int ncp_mmap(struct file *file, struct vm_area_struct *vma)

{

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

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

	

	DPRINTK("ncp_mmap: called\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE