tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 6110e02b 36a74097

+6 -5
+4 -3
fs/xfs/xfs_filestream.c
··· 350 350 /* xfs_fstrm_free_func(): callback for freeing cached stream items. */ 351 351 void 352 352 xfs_fstrm_free_func( 353 - xfs_ino_t ino, 354 - fstrm_item_t *item) 353 + unsigned long ino, 354 + void *data) 355 355 { 356 + fstrm_item_t *item = (fstrm_item_t *)data; 356 357 xfs_inode_t *ip = item->ip; 357 358 int ref; 358 359 ··· 439 438 grp_count = 10; 440 439 441 440 err = xfs_mru_cache_create(&mp->m_filestream, lifetime, grp_count, 442 - (xfs_mru_cache_free_func_t)xfs_fstrm_free_func); 441 + xfs_fstrm_free_func); 443 442 444 443 return err; 445 444 }
+2 -2
fs/xfs/xfs_log_recover.c
··· 1920 1920 stale_buf = 1; 1921 1921 break; 1922 1922 } 1923 - if (be16_to_cpu(dip->di_core.di_mode)) 1923 + if (dip->di_core.di_mode) 1924 1924 mode_count++; 1925 - if (be16_to_cpu(dip->di_core.di_gen)) 1925 + if (dip->di_core.di_gen) 1926 1926 gen_count++; 1927 1927 } 1928 1928