Browse Source

[PATCH] hugetlb: remove repeated code

Clean up some repeated code related to HugeTLB.  hugetlb_zero_setup would
have already allocated the file->f_op.

Signed-off-by: Krishnakumar. R <rkrishnakumar@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Krishnakumar R 19 years ago
parent
commit
551110a94a
1 changed files with 4 additions and 3 deletions
  1. 4 3
      ipc/shm.c

+ 4 - 3
ipc/shm.c

@@ -233,10 +233,11 @@ static int newseg (key_t key, int shmflg, size_t size)
 	shp->id = shm_buildid(id,shp->shm_perm.seq);
 	shp->id = shm_buildid(id,shp->shm_perm.seq);
 	shp->shm_file = file;
 	shp->shm_file = file;
 	file->f_dentry->d_inode->i_ino = shp->id;
 	file->f_dentry->d_inode->i_ino = shp->id;
-	if (shmflg & SHM_HUGETLB)
-		set_file_hugepages(file);
-	else
+
+	/* Hugetlb ops would have already been assigned. */
+	if (!(shmflg & SHM_HUGETLB))
 		file->f_op = &shm_file_operations;
 		file->f_op = &shm_file_operations;
+
 	shm_tot += numpages;
 	shm_tot += numpages;
 	shm_unlock(shp);
 	shm_unlock(shp);
 	return shp->id;
 	return shp->id;