Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6110e02b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 36a74097 1bc5858d

fs/xfs/xfs_filestream.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -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;

}

}

fs/xfs/xfs_log_recover.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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++;

		}

		}