summaryrefslogtreecommitdiffstats
path: root/fs/hfsplus/hfsplus_fs.h
diff options
context:
space:
mode:
authorTony Lindgren2015-07-06 14:33:17 +0200
committerTony Lindgren2015-07-06 14:33:17 +0200
commitae745302c0a3e2b5b768690f631fc14db44467e7 (patch)
tree1db4d210a7419286b447dc09fa7400a561d55f42 /fs/hfsplus/hfsplus_fs.h
parentARM: OMAP2+: Remove unnessary return statement from the void function, omap2_... (diff)
parentARM: dts: am4372.dtsi: disable rfbi (diff)
downloadkernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.gz
kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.xz
kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.zip
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'fs/hfsplus/hfsplus_fs.h')
-rw-r--r--fs/hfsplus/hfsplus_fs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index b0441d65fa54..f91a1faf819e 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -263,7 +263,7 @@ struct hfsplus_inode_info {
static inline struct hfsplus_inode_info *HFSPLUS_I(struct inode *inode)
{
- return list_entry(inode, struct hfsplus_inode_info, vfs_inode);
+ return container_of(inode, struct hfsplus_inode_info, vfs_inode);
}
/*