diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-02-23 08:20:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-02-23 08:20:22 -0500 |
| commit | 0202b160bd4eb7a82942a233d209b0a4acb4666c (patch) | |
| tree | 7c999d2aa334b686a76aa4397352eac7f4eecb06 /fs/nfs/file.c | |
| parent | 3cbae07b51cc7564bd3fe8401b7ede5b783cb92c (diff) | |
| parent | f5f23ec8d572816c7ff9c6e5eb0c209c9faa008e (diff) | |
Merge pobox.com:/garz/repo/netdev-2.6/r8169
into pobox.com:/garz/repo/net-drivers-2.6
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index a6860e1f7bff..57ccbd277fce 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -303,10 +303,10 @@ static int do_getlk(struct file *filp, int cmd, struct file_lock *fl) status = NFS_PROTO(inode)->lock(filp, cmd, fl); else { struct file_lock *cfl = posix_test_lock(filp, fl); - if (cfl != NULL) { + + fl->fl_type = F_UNLCK; + if (cfl != NULL) memcpy(fl, cfl, sizeof(*fl)); - fl->fl_type = F_UNLCK; - } } unlock_kernel(); return status; |