Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 551110a9 authored by Krishnakumar R's avatar Krishnakumar R Committed by Linus Torvalds
Browse files

[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: default avatarKrishnakumar. R <rkrishnakumar@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0b1533f6

ipc/shm.c

+4 −3
Original line number Diff line number Diff line
@@ -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;