diff options
| author | Alex Elder <aelder@sgi.com> | 2011-08-08 14:06:24 +0200 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-08-08 14:06:24 +0200 |
| commit | 2ddb4e94065470828e131351566102274ea9e83f (patch) | |
| tree | 3eb237d28e10d7735d57c051880e8173113acef8 /fs/xfs/xfs_mount.c | |
| parent | xfs: Remove the macro XFS_BUFTARG_NAME (diff) | |
| parent | Linux 3.1-rc1 (diff) | |
| download | linux-2ddb4e94065470828e131351566102274ea9e83f.tar.xz linux-2ddb4e94065470828e131351566102274ea9e83f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'fs/xfs/xfs_mount.c')
| -rw-r--r-- | fs/xfs/xfs_mount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 49ecc170f749..0081657ad985 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -1331,7 +1331,7 @@ xfs_mountfs( ASSERT(rip != NULL); - if (unlikely((rip->i_d.di_mode & S_IFMT) != S_IFDIR)) { + if (unlikely(!S_ISDIR(rip->i_d.di_mode))) { xfs_warn(mp, "corrupted root inode %llu: not a directory", (unsigned long long)rip->i_ino); xfs_iunlock(rip, XFS_ILOCK_EXCL); |