diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-15 07:43:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 07:43:13 -0400 |
| commit | 824df399a31fe92d88eb8caf86768cc8c7c72a06 (patch) | |
| tree | f966f72be04d1eb53e17b7866c6f49bf2b7d3b93 /fs/xfs/xfs_dir2.c | |
| parent | 8b6120789598d55f6aa2b4e9ac7e70a205d857da (diff) | |
| parent | 48ec45e725aa385d72bced73b267dfaf13351876 (diff) | |
Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'fs/xfs/xfs_dir2.c')
| -rw-r--r-- | fs/xfs/xfs_dir2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c index c657bec6d951..bb1d58eb3982 100644 --- a/fs/xfs/xfs_dir2.c +++ b/fs/xfs/xfs_dir2.c | |||
| @@ -256,7 +256,7 @@ xfs_dir_cilookup_result( | |||
| 256 | !(args->op_flags & XFS_DA_OP_CILOOKUP)) | 256 | !(args->op_flags & XFS_DA_OP_CILOOKUP)) |
| 257 | return EEXIST; | 257 | return EEXIST; |
| 258 | 258 | ||
| 259 | args->value = kmem_alloc(len, KM_MAYFAIL); | 259 | args->value = kmem_alloc(len, KM_NOFS | KM_MAYFAIL); |
| 260 | if (!args->value) | 260 | if (!args->value) |
| 261 | return ENOMEM; | 261 | return ENOMEM; |
| 262 | 262 | ||