From 680584841c18722748aaa4a0e9713bfdb4b21436 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Mon, 15 Aug 2005 21:08:10 +0000
Subject: [PATCH] Branch b1_4 Don't deref NULL dirent if allocation failure,
 merge from HEAD.

---
 lustre/lvfs/lvfs_linux.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index b47be6b..afe58d9 100644
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -379,13 +379,16 @@ static int l_filldir(void *__buf, const char *name, int namlen, loff_t offset,
 {
         struct l_linux_dirent *dirent;
         struct l_readdir_callback *buf = (struct l_readdir_callback *)__buf;
-        
+
         dirent = buf->lrc_dirent;
         if (dirent)
-               dirent->lld_off = offset; 
+               dirent->lld_off = offset;
 
         OBD_ALLOC(dirent, sizeof(*dirent));
 
+        if (!dirent)
+                return -ENOMEM;
+
         list_add_tail(&dirent->lld_list, buf->lrc_list);
 
         buf->lrc_dirent = dirent;
-- 
1.8.3.1