Merge branch 'xfs-gut-icdinode-4.6' into for-next

This commit is contained in:
Dave Chinner 2016-03-07 09:30:32 +11:00
commit a2bbcb60ff
23 changed files with 429 additions and 308 deletions

View file

@ -121,7 +121,7 @@ xfs_iformat_fork(
return -EFSCORRUPTED;
}
switch (ip->i_d.di_mode & S_IFMT) {
switch (VFS_I(ip)->i_mode & S_IFMT) {
case S_IFIFO:
case S_IFCHR:
case S_IFBLK: