Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 92e5baef8578a03335059a3dec933955c361edc1

Authored by Josef Sipek
Committed by Linus Torvalds
1 parent 17506041de
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] struct path: convert ncpfs 

Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 5 changed files with 14 additions and 14 deletions Side-by-side Diff

... ... @@ -402,7 +402,7 @@
402 402  
403 403 static int ncp_readdir(struct file *filp, void *dirent, filldir_t filldir)
404 404 {
405   - struct dentry *dentry = filp->f_dentry;
  405 + struct dentry *dentry = filp->f_path.dentry;
406 406 struct inode *inode = dentry->d_inode;
407 407 struct page *page = NULL;
408 408 struct ncp_server *server = NCP_SERVER(inode);
... ... @@ -554,7 +554,7 @@
554 554 ncp_fill_cache(struct file *filp, void *dirent, filldir_t filldir,
555 555 struct ncp_cache_control *ctrl, struct ncp_entry_info *entry)
556 556 {
557   - struct dentry *newdent, *dentry = filp->f_dentry;
  557 + struct dentry *newdent, *dentry = filp->f_path.dentry;
558 558 struct inode *newino, *inode = dentry->d_inode;
559 559 struct ncp_cache_control ctl = *ctrl;
560 560 struct qstr qname;
... ... @@ -649,7 +649,7 @@
649 649 ncp_read_volume_list(struct file *filp, void *dirent, filldir_t filldir,
650 650 struct ncp_cache_control *ctl)
651 651 {
652   - struct dentry *dentry = filp->f_dentry;
  652 + struct dentry *dentry = filp->f_path.dentry;
653 653 struct inode *inode = dentry->d_inode;
654 654 struct ncp_server *server = NCP_SERVER(inode);
655 655 struct ncp_volume_info info;
... ... @@ -685,7 +685,7 @@
685 685 ncp_do_readdir(struct file *filp, void *dirent, filldir_t filldir,
686 686 struct ncp_cache_control *ctl)
687 687 {
688   - struct dentry *dentry = filp->f_dentry;
  688 + struct dentry *dentry = filp->f_path.dentry;
689 689 struct inode *dir = dentry->d_inode;
690 690 struct ncp_server *server = NCP_SERVER(dir);
691 691 struct nw_search_sequence seq;
... ... @@ -101,7 +101,7 @@
101 101 static ssize_t
102 102 ncp_file_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
103 103 {
104   - struct dentry *dentry = file->f_dentry;
  104 + struct dentry *dentry = file->f_path.dentry;
105 105 struct inode *inode = dentry->d_inode;
106 106 size_t already_read = 0;
107 107 off_t pos;
... ... @@ -182,7 +182,7 @@
182 182 static ssize_t
183 183 ncp_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
184 184 {
185   - struct dentry *dentry = file->f_dentry;
  185 + struct dentry *dentry = file->f_path.dentry;
186 186 struct inode *inode = dentry->d_inode;
187 187 size_t already_written = 0;
188 188 off_t pos;
... ... @@ -471,7 +471,7 @@
471 471 if (!ncp_filp)
472 472 goto out;
473 473 error = -ENOTSOCK;
474   - sock_inode = ncp_filp->f_dentry->d_inode;
  474 + sock_inode = ncp_filp->f_path.dentry->d_inode;
475 475 if (!S_ISSOCK(sock_inode->i_mode))
476 476 goto out_fput;
477 477 sock = SOCKET_I(sock_inode);
... ... @@ -504,7 +504,7 @@
504 504 if (!server->info_filp)
505 505 goto out_fput;
506 506 error = -ENOTSOCK;
507   - sock_inode = server->info_filp->f_dentry->d_inode;
  507 + sock_inode = server->info_filp->f_path.dentry->d_inode;
508 508 if (!S_ISSOCK(sock_inode->i_mode))
509 509 goto out_fput2;
510 510 info_sock = SOCKET_I(sock_inode);
... ... @@ -35,7 +35,7 @@
35 35 ncp_get_fs_info(struct ncp_server * server, struct file *file,
36 36 struct ncp_fs_info __user *arg)
37 37 {
38   - struct inode *inode = file->f_dentry->d_inode;
  38 + struct inode *inode = file->f_path.dentry->d_inode;
39 39 struct ncp_fs_info info;
40 40  
41 41 if ((file_permission(file, MAY_WRITE) != 0)
... ... @@ -65,7 +65,7 @@
65 65 ncp_get_fs_info_v2(struct ncp_server * server, struct file *file,
66 66 struct ncp_fs_info_v2 __user * arg)
67 67 {
68   - struct inode *inode = file->f_dentry->d_inode;
  68 + struct inode *inode = file->f_path.dentry->d_inode;
69 69 struct ncp_fs_info_v2 info2;
70 70  
71 71 if ((file_permission(file, MAY_WRITE) != 0)
... ... @@ -136,7 +136,7 @@
136 136 ncp_get_compat_fs_info_v2(struct ncp_server * server, struct file *file,
137 137 struct compat_ncp_fs_info_v2 __user * arg)
138 138 {
139   - struct inode *inode = file->f_dentry->d_inode;
  139 + struct inode *inode = file->f_path.dentry->d_inode;
140 140 struct compat_ncp_fs_info_v2 info2;
141 141  
142 142 if ((file_permission(file, MAY_WRITE) != 0)
... ... @@ -824,7 +824,7 @@
824 824 #ifdef CONFIG_COMPAT
825 825 long ncp_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
826 826 {
827   - struct inode *inode = file->f_dentry->d_inode;
  827 + struct inode *inode = file->f_path.dentry->d_inode;
828 828 int ret;
829 829  
830 830 lock_kernel();
... ... @@ -29,7 +29,7 @@
29 29 unsigned long address, int *type)
30 30 {
31 31 struct file *file = area->vm_file;
32   - struct dentry *dentry = file->f_dentry;
  32 + struct dentry *dentry = file->f_path.dentry;
33 33 struct inode *inode = dentry->d_inode;
34 34 struct page* page;
35 35 char *pg_addr;
... ... @@ -106,7 +106,7 @@
106 106 /* This is used for a general mmap of a ncp file */
107 107 int ncp_mmap(struct file *file, struct vm_area_struct *vma)
108 108 {
109   - struct inode *inode = file->f_dentry->d_inode;
  109 + struct inode *inode = file->f_path.dentry->d_inode;
110 110  
111 111 DPRINTK("ncp_mmap: called\n");
112 112