X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Ffcntl.c;h=6fbc9d8fcc3621abb4af0684a79828d6f293d6b6;hb=f2ab4461249df85b20930a7a57b54f39c5ae291a;hp=286a9f8f3d49886ba4b654c9359dcd3f15073cda;hpb=7ed20e1ad521b5f5df61bf6559ae60738e393741;p=linux-2.6 diff --git a/fs/fcntl.c b/fs/fcntl.c index 286a9f8f3d..6fbc9d8fcc 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -288,7 +288,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, break; case F_SETLK: case F_SETLKW: - err = fcntl_setlk(filp, cmd, (struct flock __user *) arg); + err = fcntl_setlk(fd, filp, cmd, (struct flock __user *) arg); break; case F_GETOWN: /* @@ -376,7 +376,8 @@ asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg break; case F_SETLK64: case F_SETLKW64: - err = fcntl_setlk64(filp, cmd, (struct flock64 __user *) arg); + err = fcntl_setlk64(fd, filp, cmd, + (struct flock64 __user *) arg); break; default: err = do_fcntl(fd, cmd, arg, filp);