diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-22 15:56:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-22 15:56:13 -0400 |
| commit | 6110e02b97377a2903853faf3ecaff0e742fbe93 (patch) | |
| tree | 44fca61193f773e84c6c38ba8d9712d151677d8b /fs/xfs/xfs_log_recover.c | |
| parent | 36a740974129d7301054fa810adf22025896be78 (diff) | |
| parent | 1bc5858d0d40e07697b5eda47ed8628b8a934235 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] fix valid but harmless sparse warning
[XFS] fix filestreams on 32-bit boxes
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 dacb19739cc2..7174991f4bef 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c | |||
| @@ -1920,9 +1920,9 @@ xlog_recover_do_reg_buffer( | |||
| 1920 | stale_buf = 1; | 1920 | stale_buf = 1; |
| 1921 | break; | 1921 | break; |
| 1922 | } | 1922 | } |
| 1923 | if (be16_to_cpu(dip->di_core.di_mode)) | 1923 | if (dip->di_core.di_mode) |
| 1924 | mode_count++; | 1924 | mode_count++; |
| 1925 | if (be16_to_cpu(dip->di_core.di_gen)) | 1925 | if (dip->di_core.di_gen) |
| 1926 | gen_count++; | 1926 | gen_count++; |
| 1927 | } | 1927 | } |
| 1928 | 1928 | ||