diff options
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/file.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 1cf07e4ad136..ee140c53dba6 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -392,15 +392,14 @@ out_swapfile: | |||
392 | 392 | ||
393 | static int do_getlk(struct file *filp, int cmd, struct file_lock *fl) | 393 | static int do_getlk(struct file *filp, int cmd, struct file_lock *fl) |
394 | { | 394 | { |
395 | struct file_lock *cfl; | 395 | struct file_lock cfl; |
396 | struct inode *inode = filp->f_mapping->host; | 396 | struct inode *inode = filp->f_mapping->host; |
397 | int status = 0; | 397 | int status = 0; |
398 | 398 | ||
399 | lock_kernel(); | 399 | lock_kernel(); |
400 | /* Try local locking first */ | 400 | /* Try local locking first */ |
401 | cfl = posix_test_lock(filp, fl); | 401 | if (posix_test_lock(filp, fl, &cfl)) { |
402 | if (cfl != NULL) { | 402 | locks_copy_lock(fl, &cfl); |
403 | locks_copy_lock(fl, cfl); | ||
404 | goto out; | 403 | goto out; |
405 | } | 404 | } |
406 | 405 | ||