diff --git a/[refs] b/[refs] index 76640046dfde..7ef39a664290 100644 --- 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 index c69682a4262a..369ef53e89e1 100644 --- 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);