Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit bb668734c4c960c8f61f017585b323b97e5f47b5

Authored by David Howells
Committed by Al Viro
1 parent df2b1afde1
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, 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

VFS: assorted d_backing_inode() annotations 

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

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

arch/x86/kvm/assigned-dev.c
Diff comments   View file @ bb66873
... ... @@ -666,7 +666,7 @@
666 666 if (r)
667 667 return r;
668 668  
669   - inode = path.dentry->d_inode;
  669 + inode = d_backing_inode(path.dentry);
670 670  
671 671 r = inode_permission(inode, MAY_READ | MAY_WRITE | MAY_ACCESS);
672 672 path_put(&path);
drivers/mtd/ubi/build.c
Diff comments   View file @ bb66873
... ... @@ -1164,9 +1164,9 @@
1164 1164 return ERR_PTR(err);
1165 1165  
1166 1166 /* MTD device number is defined by the major / minor numbers */
1167   - major = imajor(path.dentry->d_inode);
1168   - minor = iminor(path.dentry->d_inode);
1169   - mode = path.dentry->d_inode->i_mode;
  1167 + major = imajor(d_backing_inode(path.dentry));
  1168 + minor = iminor(d_backing_inode(path.dentry));
  1169 + mode = d_backing_inode(path.dentry)->i_mode;
1170 1170 path_put(&path);
1171 1171 if (major != MTD_CHAR_MAJOR || !S_ISCHR(mode))
1172 1172 return ERR_PTR(-EINVAL);
drivers/mtd/ubi/kapi.c
Diff comments   View file @ bb66873
... ... @@ -314,7 +314,7 @@
314 314 if (error)
315 315 return ERR_PTR(error);
316 316  
317   - inode = path.dentry->d_inode;
  317 + inode = d_backing_inode(path.dentry);
318 318 mod = inode->i_mode;
319 319 ubi_num = ubi_major2num(imajor(inode));
320 320 vol_id = iminor(inode) - 1;
... ... @@ -1716,7 +1716,7 @@
1716 1716 if (error)
1717 1717 return ERR_PTR(error);
1718 1718  
1719   - inode = path.dentry->d_inode;
  1719 + inode = d_backing_inode(path.dentry);
1720 1720 error = -ENOTBLK;
1721 1721 if (!S_ISBLK(inode->i_mode))
1722 1722 goto fail;
... ... @@ -774,12 +774,12 @@
774 774 struct posix_acl *acl;
775 775 int error;
776 776  
777   - if (!IS_POSIXACL(dentry->d_inode))
  777 + if (!IS_POSIXACL(d_backing_inode(dentry)))
778 778 return -EOPNOTSUPP;
779 779 if (d_is_symlink(dentry))
780 780 return -EOPNOTSUPP;
781 781  
782   - acl = get_acl(dentry->d_inode, type);
  782 + acl = get_acl(d_backing_inode(dentry), type);
783 783 if (IS_ERR(acl))
784 784 return PTR_ERR(acl);
785 785 if (acl == NULL)
... ... @@ -795,7 +795,7 @@
795 795 posix_acl_xattr_set(struct dentry *dentry, const char *name,
796 796 const void *value, size_t size, int flags, int type)
797 797 {
798   - struct inode *inode = dentry->d_inode;
  798 + struct inode *inode = d_backing_inode(dentry);
799 799 struct posix_acl *acl = NULL;
800 800 int ret;
801 801  
... ... @@ -834,7 +834,7 @@
834 834 const char *xname;
835 835 size_t size;
836 836  
837   - if (!IS_POSIXACL(dentry->d_inode))
  837 + if (!IS_POSIXACL(d_backing_inode(dentry)))
838 838 return -EOPNOTSUPP;
839 839 if (d_is_symlink(dentry))
840 840 return -EOPNOTSUPP;
... ... @@ -51,7 +51,7 @@
51 51 */
52 52 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
53 53 {
54   - struct inode *inode = path->dentry->d_inode;
  54 + struct inode *inode = d_backing_inode(path->dentry);
55 55  
56 56 if (inode->i_op->getattr)
57 57 return inode->i_op->getattr(path->mnt, path->dentry, stat);
... ... @@ -326,7 +326,7 @@
326 326 retry:
327 327 error = user_path_at_empty(dfd, pathname, lookup_flags, &path, &empty);
328 328 if (!error) {
329   - struct inode *inode = path.dentry->d_inode;
  329 + struct inode *inode = d_backing_inode(path.dentry);
330 330  
331 331 error = empty ? -ENOENT : -EINVAL;
332 332 if (inode->i_op->readlink) {