Remove the last direct usage of struct inode within the hugetlb functions.
hugetlbpage.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff -urpN htlb-2.5.47-5/arch/i386/mm/hugetlbpage.c htlb-2.5.47-6/arch/i386/mm/hugetlbpage.c
--- htlb-2.5.47-5/arch/i386/mm/hugetlbpage.c 2002-11-11 21:49:53.000000000 -0800
+++ htlb-2.5.47-6/arch/i386/mm/hugetlbpage.c 2002-11-11 21:55:12.000000000 -0800
@@ -398,13 +398,13 @@ static int alloc_shared_hugetlb_pages(in
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
- struct inode *inode;
+ struct hugetlb_key *hugetlb_key;
int retval = -ENOMEM;
int newalloc = 0;
- inode = (struct inode *)alloc_key(key, len, prot, flag, &newalloc);
- if (IS_ERR(inode)) {
- retval = PTR_ERR(inode);
+ hugetlb_key = alloc_key(key, len, prot, flag, &newalloc);
+ if (IS_ERR(hugetlb_key)) {
+ retval = PTR_ERR(hugetlb_key);
spin_unlock(&htlbpage_lock);
goto out_err;
} else
@@ -421,7 +421,7 @@ static int alloc_shared_hugetlb_pages(in
goto freeinode;
}
- retval = prefault_key((struct hugetlb_key *)inode, vma);
+ retval = prefault_key(hugetlb_key, vma);
if (retval)
goto out;
@@ -429,7 +429,7 @@ static int alloc_shared_hugetlb_pages(in
vma->vm_ops = &hugetlb_vm_ops;
spin_unlock(&mm->page_table_lock);
spin_lock(&htlbpage_lock);
- clear_key_busy((struct hugetlb_key *)inode);
+ clear_key_busy(hugetlb_key);
spin_unlock(&htlbpage_lock);
return retval;
out:
@@ -448,7 +448,7 @@ out:
out_err: spin_unlock(&htlbpage_lock);
freeinode:
if (newalloc)
- release_key((struct hugetlb_key *)inode);
+ release_key(hugetlb_key);
return retval;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Nov 15 2002 - 22:00:24 EST