luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] hugetlb: remove repeated code

Browse Source 
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>
This commit is contained in:
Krishnakumar R 2005-10-29 18:16:45 -07:00 committed by Linus Torvalds
parent 0b1533f67c
commit 551110a94a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipc/shm.c
View File

@ -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); /* Hugetlb ops would have already been assigned. */
else 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;