lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2007-09-22 12:56:13 -07:00
parent 36a7409741 1bc5858d0d
commit 6110e02b97
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/xfs/xfs_filestream.c
View File

@@ -350,9 +350,10 @@ _xfs_filestream_update_ag(
/* xfs_fstrm_free_func(): callback for freeing cached stream items. */ /* xfs_fstrm_free_func(): callback for freeing cached stream items. */
void void
xfs_fstrm_free_func( xfs_fstrm_free_func(
xfs_ino_t ino, unsigned long ino,
fstrm_item_t *item) void *data)
{ {
fstrm_item_t *item = (fstrm_item_t *)data;
xfs_inode_t *ip = item->ip; xfs_inode_t *ip = item->ip;
int ref; int ref;
@@ -438,7 +439,7 @@ xfs_filestream_mount(
grp_count = 10; grp_count = 10;
err = xfs_mru_cache_create(&mp->m_filestream, lifetime, grp_count, err = xfs_mru_cache_create(&mp->m_filestream, lifetime, grp_count,
(xfs_mru_cache_free_func_t)xfs_fstrm_free_func); xfs_fstrm_free_func);
return err; return err;
} }

4
fs/xfs/xfs_log_recover.c
View File

@@ -1920,9 +1920,9 @@ xlog_recover_do_reg_buffer(
stale_buf = 1; stale_buf = 1;
break; break;
} }
if (be16_to_cpu(dip->di_core.di_mode)) if (dip->di_core.di_mode)
mode_count++; mode_count++;
if (be16_to_cpu(dip->di_core.di_gen)) if (dip->di_core.di_gen)
gen_count++; gen_count++;
} }