diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /fs/ubifs/lpt.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'fs/ubifs/lpt.c')
| -rw-r--r-- | fs/ubifs/lpt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index 72775d35b99e..ef5155e109a2 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c | |||
| @@ -1270,10 +1270,9 @@ static int read_pnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip) | |||
| 1270 | lnum = branch->lnum; | 1270 | lnum = branch->lnum; |
| 1271 | offs = branch->offs; | 1271 | offs = branch->offs; |
| 1272 | pnode = kzalloc(sizeof(struct ubifs_pnode), GFP_NOFS); | 1272 | pnode = kzalloc(sizeof(struct ubifs_pnode), GFP_NOFS); |
| 1273 | if (!pnode) { | 1273 | if (!pnode) |
| 1274 | err = -ENOMEM; | 1274 | return -ENOMEM; |
| 1275 | goto out; | 1275 | |
| 1276 | } | ||
| 1277 | if (lnum == 0) { | 1276 | if (lnum == 0) { |
| 1278 | /* | 1277 | /* |
| 1279 | * This pnode was not written which just means that the LEB | 1278 | * This pnode was not written which just means that the LEB |