From: Krishnakumar R Clean up some repeated code related to HugeTLB. hugetlb_zero_setup would have already allocated the file->f_op. Signed-off-by: Krishnakumar. R Signed-off-by: Andrew Morton --- ipc/shm.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff -puN ipc/shm.c~hugetlb-remove-repeated-code ipc/shm.c --- devel/ipc/shm.c~hugetlb-remove-repeated-code 2005-10-11 18:35:11.000000000 -0700 +++ devel-akpm/ipc/shm.c 2005-10-11 18:35:11.000000000 -0700 @@ -233,10 +233,11 @@ static int newseg (key_t key, int shmflg 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; _