]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ipc/shm.c: shm_split(): remove unneeded test for NULL shm_file_data.vm_ops
authorAndrew Morton <akpm@linux-foundation.org>
Tue, 10 Apr 2018 23:35:42 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Apr 2018 17:28:38 +0000 (10:28 -0700)
This was added by the recent "ipc/shm.c: add split function to
shm_vm_ops", but it is not necessary.

Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Laurent Dufour <ldufour@linux.vnet.ibm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
ipc/shm.c

index 1a28b6a9644949ee7cc8b2886bfb092c1f56292c..5639345dbec9d4296d29702c352ced36cf781e35 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -415,7 +415,7 @@ static int shm_split(struct vm_area_struct *vma, unsigned long addr)
        struct file *file = vma->vm_file;
        struct shm_file_data *sfd = shm_file_data(file);
 
-       if (sfd->vm_ops && sfd->vm_ops->split)
+       if (sfd->vm_ops->split)
                return sfd->vm_ops->split(vma, addr);
 
        return 0;