X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Flockd%2Fsvcsubs.c;h=dbbefbcd671255935c61783e5cf73d4122346cd7;hb=8e39df215c4b1d3e6f9e62f92d35ab1aa11104eb;hp=c0df00c74ce38b9ac77f7c9e85bfc6d119f367c1;hpb=e9ccb79927225d8cd8d022a7c09bfb2fad935b89;p=linux-2.6

diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index c0df00c74c..dbbefbcd67 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -87,7 +87,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
 	unsigned int	hash;
 	__be32		nfserr;
 
-	nlm_debug_print_fh("nlm_file_lookup", f);
+	nlm_debug_print_fh("nlm_lookup_file", f);
 
 	hash = file_hash(f);
 
@@ -182,7 +182,7 @@ again:
 			lock.fl_type  = F_UNLCK;
 			lock.fl_start = 0;
 			lock.fl_end   = OFFSET_MAX;
-			if (posix_lock_file(file->f_file, &lock) < 0) {
+			if (vfs_lock_file(file->f_file, F_SETLK, &lock, NULL) < 0) {
 				printk("lockd: unlock failure in %s:%d\n",
 						__FILE__, __LINE__);
 				return 1;