Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4c1d5a64f134b254552b6211f6f79a1da667eab7

Authored by Al Viro
1 parent 32dc730860
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

vfs: for usbfs, etc. internal vfsmounts ->mnt_sb->s_root == ->mnt_root 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 6 changed files with 8 additions and 8 deletions Side-by-side Diff

arch/ia64/kernel/perfmon.c
Diff comments   View file @ 4c1d5a6
... ... @@ -2228,7 +2228,7 @@
2228 2228 /*
2229 2229 * allocate a new dcache entry
2230 2230 */
2231   - path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
  2231 + path.dentry = d_alloc(pfmfs_mnt->mnt_root, &this);
2232 2232 if (!path.dentry) {
2233 2233 iput(inode);
2234 2234 return ERR_PTR(-ENOMEM);
drivers/usb/core/inode.c
Diff comments   View file @ 4c1d5a6
... ... @@ -501,7 +501,7 @@
501 501 */
502 502 if (!parent ) {
503 503 if (usbfs_mount && usbfs_mount->mnt_sb) {
504   - parent = usbfs_mount->mnt_sb->s_root;
  504 + parent = usbfs_mount->mnt_root;
505 505 }
506 506 }
507 507  
... ... @@ -608,7 +608,7 @@
608 608  
609 609 ignore_mount = 0;
610 610  
611   - parent = usbfs_mount->mnt_sb->s_root;
  611 + parent = usbfs_mount->mnt_root;
612 612 devices_usbfs_dentry = fs_create_file ("devices",
613 613 listmode | S_IFREG, parent,
614 614 NULL, &usbfs_devices_fops,
... ... @@ -662,7 +662,7 @@
662 662  
663 663 sprintf (name, "%03d", bus->busnum);
664 664  
665   - parent = usbfs_mount->mnt_sb->s_root;
  665 + parent = usbfs_mount->mnt_root;
666 666 bus->usbfs_dentry = fs_create_file (name, busmode | S_IFDIR, parent,
667 667 bus, NULL, busuid, busgid);
668 668 if (bus->usbfs_dentry == NULL) {
... ... @@ -312,7 +312,7 @@
312 312 if (item->ci_parent)
313 313 parent = item->ci_parent->ci_dentry;
314 314 else if (configfs_mount && configfs_mount->mnt_sb)
315   - parent = configfs_mount->mnt_sb->s_root;
  315 + parent = configfs_mount->mnt_root;
316 316 else
317 317 return -EFAULT;
318 318  
... ... @@ -160,7 +160,7 @@
160 160 * have around.
161 161 */
162 162 if (!parent)
163   - parent = debugfs_mount->mnt_sb->s_root;
  163 + parent = debugfs_mount->mnt_root;
164 164  
165 165 *dentry = NULL;
166 166 mutex_lock(&parent->d_inode->i_mutex);
... ... @@ -725,7 +725,7 @@
725 725 sb->s_fs_info = proc_mnt;
726 726  
727 727 err = -ENOMEM;
728   - root_inode = get_inode(sb, dget(proc_mnt->mnt_sb->s_root));
  728 + root_inode = get_inode(sb, dget(proc_mnt->mnt_root));
729 729 if (!root_inode)
730 730 goto out_mntput;
731 731  
... ... @@ -159,7 +159,7 @@
159 159 * have around.
160 160 */
161 161 if (!parent)
162   - parent = mount->mnt_sb->s_root;
  162 + parent = mount->mnt_root;
163 163  
164 164 mutex_lock(&parent->d_inode->i_mutex);
165 165 *dentry = lookup_one_len(name, parent, strlen(name));