---

yaml --- r: 285865 b: refs/heads/master c: 57582b3 h: refs/heads/master i: 285863: 73eea20 v: v3
git-mirror · Jan 12, 2012 · 17053d1 · 17053d1
1 parent 1076899
commit 17053d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82b906d6550ee5fe0d5553359b3c9692dd0aed31
+refs/heads/master: 57582b372f63d0f655b1a35b0d306d73d1a46775
diff --git a/trunk/fs/nfs/blocklayout/extents.c b/trunk/fs/nfs/blocklayout/extents.c
@@ -110,13 +110,7 @@ static int _add_entry(struct my_tree *tree, u64 s, int32_t tag,
 		return 0;
 	} else {
 		struct pnfs_inval_tracking *new;
-		if (storage)
-			new = storage;
-		else {
-			new = kmalloc(sizeof(*new), GFP_NOFS);
-			if (!new)
-				return -ENOMEM;
-		}
+		new = storage;
 		new->it_sector = s;
 		new->it_tags = (1 << tag);
 		list_add(&new->it_link, &pos->it_link);