Merge commit 'v2.6.26' into bkl-removal

2008-07-14 15:29:34 -06:00
parent feae1ef116 bce7f793da
commit 2fceef397f
1975 changed files with 41893 additions and 19758 deletions
--- 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)
 	if (res < 0)
 		dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"
 			" - error %d!\n",
-				__FUNCTION__, res);
+				__func__, res);
 	return res;
 }