diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:13:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 15:13:05 -0700 |
| commit | a0e3390787ef523699ae1f3f3ea0ca953e630be2 (patch) | |
| tree | 0769becdd64b31489be18fdda583e0f38eca146f /fs/nfs/idmap.c | |
| parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | nfs4: The difference of 2 pointers is ptrdiff_t (diff) | |
| download | linux-dev-a0e3390787ef523699ae1f3f3ea0ca953e630be2.tar.xz linux-dev-a0e3390787ef523699ae1f3f3ea0ca953e630be2.zip | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
nfs4: The difference of 2 pointers is ptrdiff_t
nfs: testing the wrong variable
nfs: handle lock context allocation failures in nfs_create_request
Fixed Regression in NFS Direct I/O path
Diffstat (limited to 'fs/nfs/idmap.c')
| -rw-r--r-- | fs/nfs/idmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index dec47ed8b6b9..4e2d9b6b1380 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -123,7 +123,7 @@ static ssize_t nfs_idmap_get_desc(const char *name, size_t namelen, size_t desclen = typelen + namelen + 2; *desc = kmalloc(desclen, GFP_KERNEL); - if (!desc) + if (!*desc) return -ENOMEM; cp = *desc; |