X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ipc%2Fshm.c;h=b58c651d31ae23a36c58a1de3005e6b5d46a2662;hb=ec33b309101bb2904e9fe20252f7760e254d05ec;hp=dca90489e3b0f7b9cfd189b593eeee1d3c0f197e;hpb=1d6ae775d7a948c9575658eb41184fd2e506c0df;p=cascardo%2Flinux.git diff --git a/ipc/shm.c b/ipc/shm.c index dca90489e3b0..b58c651d31ae 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;