diff options
| author | Alex Elder <aelder@sgi.com> | 2011-08-08 08:06:24 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-08-08 08:06:24 -0400 |
| commit | 2ddb4e94065470828e131351566102274ea9e83f (patch) | |
| tree | 3eb237d28e10d7735d57c051880e8173113acef8 /fs/xfs/xfs_mount.c | |
| parent | c35a549c8b9e85bdff7e531a410d10e36b4b4f32 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
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( | |||
| 1331 | 1331 | ||
| 1332 | ASSERT(rip != NULL); | 1332 | ASSERT(rip != NULL); |
| 1333 | 1333 | ||
| 1334 | if (unlikely((rip->i_d.di_mode & S_IFMT) != S_IFDIR)) { | 1334 | if (unlikely(!S_ISDIR(rip->i_d.di_mode))) { |
| 1335 | xfs_warn(mp, "corrupted root inode %llu: not a directory", | 1335 | xfs_warn(mp, "corrupted root inode %llu: not a directory", |
| 1336 | (unsigned long long)rip->i_ino); | 1336 | (unsigned long long)rip->i_ino); |
| 1337 | xfs_iunlock(rip, XFS_ILOCK_EXCL); | 1337 | xfs_iunlock(rip, XFS_ILOCK_EXCL); |