diff options
| author |   Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 08:32:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 08:33:14 +0100 |
| commit | f19693a17c6705e197eb24d4618060eaac1b535c (patch) | |
| tree | fc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd /fs/btrfs/export.c | |
| parent | ARM: mxc91231: use .init_early to initialize cpu type (diff) | |
| parent | Linux 2.6.38-rc4 (diff) | |
| download | wireguard-linux-f19693a17c6705e197eb24d4618060eaac1b535c.tar.xz wireguard-linux-f19693a17c6705e197eb24d4618060eaac1b535c.zip | |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
Conflicts:
arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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) int ret; path = btrfs_alloc_path(); + if (!path) + return ERR_PTR(-ENOMEM); if (dir->i_ino == BTRFS_FIRST_FREE_OBJECTID) { key.objectid = root->root_key.objectid; |