Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 1d56a96956158d0fb1902c56ffa0e38caa39bddb

Authored by Josef Sipek
Committed by Linus Torvalds
1 parent 514653e259
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 afs 

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 2 changed files with 6 additions and 6 deletions Side-by-side Diff

... ... @@ -392,10 +392,10 @@
392 392 unsigned fpos;
393 393 int ret;
394 394  
395   - _enter("{%Ld,{%lu}}", file->f_pos, file->f_dentry->d_inode->i_ino);
  395 + _enter("{%Ld,{%lu}}", file->f_pos, file->f_path.dentry->d_inode->i_ino);
396 396  
397 397 fpos = file->f_pos;
398   - ret = afs_dir_iterate(file->f_dentry->d_inode, &fpos, cookie, filldir);
  398 + ret = afs_dir_iterate(file->f_path.dentry->d_inode, &fpos, cookie, filldir);
399 399 file->f_pos = fpos;
400 400  
401 401 _leave(" = %d", ret);
... ... @@ -136,11 +136,11 @@
136 136 {
137 137 kenter("%p,%p{%p{%s},%s}",
138 138 inode, file,
139   - file->f_dentry->d_parent,
140   - file->f_dentry->d_parent ?
141   - file->f_dentry->d_parent->d_name.name :
  139 + file->f_path.dentry->d_parent,
  140 + file->f_path.dentry->d_parent ?
  141 + file->f_path.dentry->d_parent->d_name.name :
142 142 (const unsigned char *) "",
143   - file->f_dentry->d_name.name);
  143 + file->f_path.dentry->d_name.name);
144 144  
145 145 return -EREMOTE;
146 146 } /* end afs_mntpt_open() */