diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-19 16:35:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-19 16:35:14 +0100 |
| commit | ca680888d5d0d03862ec311a83c6a1c7a1e00a01 (patch) | |
| tree | bc2a1777f1d715f947fa77940ebce5c43029b37b /fs/nfs/file.c | |
| parent | 40dc11ffb35e8c4e8fa71092048e0f8de9db758c (diff) | |
| parent | b0c3844d8af6b9f3f18f31e1b0502fbefa2166be (diff) | |
Merge commit 'v2.6.37-rc6' into sched/core
Merge reason: Update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 60677f9f1311..7bf029ef4084 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -693,6 +693,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) { 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); @@ -700,6 +701,7 @@ do_getlk(struct file *filp, int cmd, struct file_lock *fl, int is_local) /* found a conflict */ goto out; } + fl->fl_type = saved_type; if (nfs_have_delegation(inode, FMODE_READ)) goto out_noconflict; |