diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /fs/nfs/file.c | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index a34eb78989f5..4e98a56a1777 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
| @@ -530,7 +530,7 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl) | |||
| 530 | if (res < 0) | 530 | if (res < 0) |
| 531 | dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager" | 531 | dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager" |
| 532 | " - error %d!\n", | 532 | " - error %d!\n", |
| 533 | __FUNCTION__, res); | 533 | __func__, res); |
| 534 | return res; | 534 | return res; |
| 535 | } | 535 | } |
| 536 | 536 | ||