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 | |
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
-rw-r--r-- | fs/xfs/xfs_filestream.c | 7 | ||||
-rw-r--r-- | fs/xfs/xfs_log_recover.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c index 16f8e175167d..36d8f6aa11af 100644 --- a/fs/xfs/xfs_filestream.c +++ b/fs/xfs/xfs_filestream.c | |||
@@ -350,9 +350,10 @@ _xfs_filestream_update_ag( | |||
350 | /* xfs_fstrm_free_func(): callback for freeing cached stream items. */ | 350 | /* xfs_fstrm_free_func(): callback for freeing cached stream items. */ |
351 | void | 351 | void |
352 | xfs_fstrm_free_func( | 352 | xfs_fstrm_free_func( |
353 | xfs_ino_t ino, | 353 | unsigned long ino, |
354 | fstrm_item_t *item) | 354 | void *data) |
355 | { | 355 | { |
356 | fstrm_item_t *item = (fstrm_item_t *)data; | ||
356 | xfs_inode_t *ip = item->ip; | 357 | xfs_inode_t *ip = item->ip; |
357 | int ref; | 358 | int ref; |
358 | 359 | ||
@@ -438,7 +439,7 @@ xfs_filestream_mount( | |||
438 | grp_count = 10; | 439 | grp_count = 10; |
439 | 440 | ||
440 | err = xfs_mru_cache_create(&mp->m_filestream, lifetime, grp_count, | 441 | err = xfs_mru_cache_create(&mp->m_filestream, lifetime, grp_count, |
441 | (xfs_mru_cache_free_func_t)xfs_fstrm_free_func); | 442 | xfs_fstrm_free_func); |
442 | 443 | ||
443 | return err; | 444 | return err; |
444 | } | 445 | } |
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 | ||