--- fs/nfs/file.c

+++ fs/nfs/file.c

@@ -680,6 +680,7 @@ static int do_getlk(struct file *filp, i

{

struct inode *inode = filp->f_mapping->host;

int status = 0;

+ unsigned int saved_type = fl->fl_type;

/* Try local locking first */

posix_test_lock(filp, fl);

@@ -687,6 +688,7 @@ static int do_getlk(struct file *filp, i

/* found a conflict */

goto out;

}

+ fl->fl_type = saved_type;

if (nfs_have_delegation(inode, FMODE_READ))

goto out_noconflict;