diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-12 22:48:01 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-12 22:48:01 -0400 |
| commit | e290861f99131fc42d98012a9ea2dc185f08f8f9 (patch) | |
| tree | 5c8b92d095d74d03b281711c81bac54bd59989cd /fs/xfs/xfs_dir2.c | |
| parent | b4a757367d36cebddcd332a4024d92f1e87af370 (diff) | |
| parent | dbefd606a3b3634799b625f4900336e61c89e868 (diff) | |
Merge branch 'sh/stable-updates'
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 | ||