diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-03-25 05:12:30 +0100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-03-25 05:12:30 +0100 |
| commit | 2b93681f593577df6fcb9af61947beaace071b74 (patch) | |
| tree | 1d4826b38a06d3da93de1aaf9f66dda2cd99911d /fs/xfs/xfs_super.c | |
| parent | Merge branch 'xfs-rename-whiteout' into for-next (diff) | |
| parent | xfs: Fix incorrect positive ENOMEM return (diff) | |
| download | linux-2b93681f593577df6fcb9af61947beaace071b74.tar.xz linux-2b93681f593577df6fcb9af61947beaace071b74.zip | |
Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next
Conflicts:
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/xfs_inode.c
Diffstat (limited to 'fs/xfs/xfs_super.c')
| -rw-r--r-- | fs/xfs/xfs_super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 3ad0b17885f1..8782b36517b5 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -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) |