diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 10:05:05 -0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /fs/nfs/file.c | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
Merge commit 'linus/master' into sched-fixes-for-linus
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 3536b01164f9..d84a3d8f32af 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
| @@ -526,7 +526,7 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl) | |||
| 526 | if (res < 0) | 526 | if (res < 0) |
| 527 | dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager" | 527 | dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager" |
| 528 | " - error %d!\n", | 528 | " - error %d!\n", |
| 529 | __FUNCTION__, res); | 529 | __func__, res); |
| 530 | return res; | 530 | return res; |
| 531 | } | 531 | } |
| 532 | 532 | ||