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_log_recover.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_log_recover.c')
-rw-r--r-- | fs/xfs/xfs_log_recover.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 93786e518d87..1076b7effcdc 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
@@ -2277,7 +2277,7 @@ xlog_recover_inode_pass2( | |||
2277 | /* Take the opportunity to reset the flush iteration count */ | 2277 | /* Take the opportunity to reset the flush iteration count */ |
2278 | dicp->di_flushiter = 0; | 2278 | dicp->di_flushiter = 0; |
2279 | 2279 | ||
2280 | if (unlikely((dicp->di_mode & S_IFMT) == S_IFREG)) { | 2280 | if (unlikely(S_ISREG(dicp->di_mode))) { |
2281 | if ((dicp->di_format != XFS_DINODE_FMT_EXTENTS) && | 2281 | if ((dicp->di_format != XFS_DINODE_FMT_EXTENTS) && |
2282 | (dicp->di_format != XFS_DINODE_FMT_BTREE)) { | 2282 | (dicp->di_format != XFS_DINODE_FMT_BTREE)) { |
2283 | XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(3)", | 2283 | XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(3)", |
@@ -2290,7 +2290,7 @@ xlog_recover_inode_pass2( | |||
2290 | error = EFSCORRUPTED; | 2290 | error = EFSCORRUPTED; |
2291 | goto error; | 2291 | goto error; |
2292 | } | 2292 | } |
2293 | } else if (unlikely((dicp->di_mode & S_IFMT) == S_IFDIR)) { | 2293 | } else if (unlikely(S_ISDIR(dicp->di_mode))) { |
2294 | if ((dicp->di_format != XFS_DINODE_FMT_EXTENTS) && | 2294 | if ((dicp->di_format != XFS_DINODE_FMT_EXTENTS) && |
2295 | (dicp->di_format != XFS_DINODE_FMT_BTREE) && | 2295 | (dicp->di_format != XFS_DINODE_FMT_BTREE) && |
2296 | (dicp->di_format != XFS_DINODE_FMT_LOCAL)) { | 2296 | (dicp->di_format != XFS_DINODE_FMT_LOCAL)) { |