forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next

Browse source 
Conflicts:
	fs/xfs/libxfs/xfs_bmap.c
	fs/xfs/xfs_inode.c
This commit is contained in:
Dave Chinner 2015-03-25 15:12:30 +11:00
commit 2b93681f59
8 changed files with 20 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/xfs/xfs_super.c
View file

@ -1380,7 +1380,7 @@ xfs_init_percpu_counters(
error = percpu_counter_init(&mp->m_icount, 0, GFP_KERNEL);
if (error)
return ENOMEM;
return -ENOMEM;
error = percpu_counter_init(&mp->m_ifree, 0, GFP_KERNEL);
if (error)