diff options
author | David Howells <dhowells@redhat.com> | 2015-03-17 18:26:21 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-15 15:06:59 -0400 |
commit | bb668734c4c960c8f61f017585b323b97e5f47b5 (patch) | |
tree | e9c90394fb8342aeccd1b337c2e7949c5c843bec /drivers/mtd | |
parent | df2b1afde178f01c6a1b2ec285ca8bcfd4c66640 (diff) |
VFS: assorted d_backing_inode() annotations
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/ubi/build.c | 6 | ||||
-rw-r--r-- | drivers/mtd/ubi/kapi.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index ba01a8d22d28..5f58635b8360 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c | |||
@@ -1164,9 +1164,9 @@ static struct mtd_info * __init open_mtd_by_chdev(const char *mtd_dev) | |||
1164 | return ERR_PTR(err); | 1164 | return ERR_PTR(err); |
1165 | 1165 | ||
1166 | /* MTD device number is defined by the major / minor numbers */ | 1166 | /* MTD device number is defined by the major / minor numbers */ |
1167 | major = imajor(path.dentry->d_inode); | 1167 | major = imajor(d_backing_inode(path.dentry)); |
1168 | minor = iminor(path.dentry->d_inode); | 1168 | minor = iminor(d_backing_inode(path.dentry)); |
1169 | mode = path.dentry->d_inode->i_mode; | 1169 | mode = d_backing_inode(path.dentry)->i_mode; |
1170 | path_put(&path); | 1170 | path_put(&path); |
1171 | if (major != MTD_CHAR_MAJOR || !S_ISCHR(mode)) | 1171 | if (major != MTD_CHAR_MAJOR || !S_ISCHR(mode)) |
1172 | return ERR_PTR(-EINVAL); | 1172 | return ERR_PTR(-EINVAL); |
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c index 478e00cf2d9e..e844887732fb 100644 --- a/drivers/mtd/ubi/kapi.c +++ b/drivers/mtd/ubi/kapi.c | |||
@@ -314,7 +314,7 @@ struct ubi_volume_desc *ubi_open_volume_path(const char *pathname, int mode) | |||
314 | if (error) | 314 | if (error) |
315 | return ERR_PTR(error); | 315 | return ERR_PTR(error); |
316 | 316 | ||
317 | inode = path.dentry->d_inode; | 317 | inode = d_backing_inode(path.dentry); |
318 | mod = inode->i_mode; | 318 | mod = inode->i_mode; |
319 | ubi_num = ubi_major2num(imajor(inode)); | 319 | ubi_num = ubi_major2num(imajor(inode)); |
320 | vol_id = iminor(inode) - 1; | 320 | vol_id = iminor(inode) - 1; |