diff options
| author | James Morris <jmorris@namei.org> | 2009-08-19 19:18:42 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-19 19:18:42 -0400 |
| commit | ece13879e74313e62109e0755dd3d4f172df89e2 (patch) | |
| tree | 1fe96ab392c1ff203a6fb3f67ed0ed577056572e /fs/xfs/xfs_bmap.c | |
| parent | b08dc3eba0c34027010caeda258f495074ae3a54 (diff) | |
| parent | 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f (diff) | |
Merge branch 'master' into next
Conflicts:
security/Kconfig
Manual fix.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
| -rw-r--r-- | fs/xfs/xfs_bmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 7928b9983c1d..8ee5b5a76a2a 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
| @@ -6009,7 +6009,7 @@ xfs_getbmap( | |||
| 6009 | */ | 6009 | */ |
| 6010 | error = ENOMEM; | 6010 | error = ENOMEM; |
| 6011 | subnex = 16; | 6011 | subnex = 16; |
| 6012 | map = kmem_alloc(subnex * sizeof(*map), KM_MAYFAIL); | 6012 | map = kmem_alloc(subnex * sizeof(*map), KM_MAYFAIL | KM_NOFS); |
| 6013 | if (!map) | 6013 | if (!map) |
| 6014 | goto out_unlock_ilock; | 6014 | goto out_unlock_ilock; |
| 6015 | 6015 | ||