X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ipc%2Fshm.c;h=b58c651d31ae23a36c58a1de3005e6b5d46a2662;hb=b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2;hp=dca90489e3b0f7b9cfd189b593eeee1d3c0f197e;hpb=64e47488c913ac704d465a6af86a26786d1412a5;p=linux-2.6

diff --git a/ipc/shm.c b/ipc/shm.c
index dca90489e3..b58c651d31 100644
--- a/ipc/shm.c
+++ b/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->shm_file = file;
 	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;
+
 	shm_tot += numpages;
 	shm_unlock(shp);
 	return shp->id;