diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/lockd/svclock.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/lockd/svclock.c')
| -rw-r--r-- | fs/lockd/svclock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 4d81553d2948..81aca859bfde 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
| @@ -752,7 +752,7 @@ nlmsvc_grant_blocked(struct nlm_block *block) | |||
| 752 | return; | 752 | return; |
| 753 | default: | 753 | default: |
| 754 | printk(KERN_WARNING "lockd: unexpected error %d in %s!\n", | 754 | printk(KERN_WARNING "lockd: unexpected error %d in %s!\n", |
| 755 | -error, __FUNCTION__); | 755 | -error, __func__); |
| 756 | nlmsvc_insert_block(block, 10 * HZ); | 756 | nlmsvc_insert_block(block, 10 * HZ); |
| 757 | nlmsvc_release_block(block); | 757 | nlmsvc_release_block(block); |
| 758 | return; | 758 | return; |