diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 07:33:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 07:33:41 -0500 |
| commit | a3ec4a603faf4244e275bf11b467aad092dfbd8a (patch) | |
| tree | 1c15009716b37629070ea221a00eb9fe2303a317 /fs/btrfs/export.c | |
| parent | 51563cd53c4b1c1790fccd2e0af0e2b756589af9 (diff) | |
| parent | 85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff) | |
Merge commit 'v2.6.38-rc5' into core/locking
Merge reason: pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/btrfs/export.c')
| -rw-r--r-- | fs/btrfs/export.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c index 9786963b07e5..ff27d7a477b2 100644 --- a/fs/btrfs/export.c +++ b/fs/btrfs/export.c | |||
| @@ -171,6 +171,8 @@ static struct dentry *btrfs_get_parent(struct dentry *child) | |||
| 171 | int ret; | 171 | int ret; |
| 172 | 172 | ||
| 173 | path = btrfs_alloc_path(); | 173 | path = btrfs_alloc_path(); |
| 174 | if (!path) | ||
| 175 | return ERR_PTR(-ENOMEM); | ||
| 174 | 176 | ||
| 175 | if (dir->i_ino == BTRFS_FIRST_FREE_OBJECTID) { | 177 | if (dir->i_ino == BTRFS_FIRST_FREE_OBJECTID) { |
| 176 | key.objectid = root->root_key.objectid; | 178 | key.objectid = root->root_key.objectid; |