Skip to contentSkip to conversation

Remove incorrect do_vfs_lock message

PATCH In review Fabio Olive Leite 4 participants 4 messages Sep 7, 2010 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Remove incorrect do_vfs_lock message

The do_vfs_lock function on fs/nfs/file.c is only called if NLM is not being used, via the -onolock mount option. Therefore it cannot really be "out of sync with lock manager" when the local locking function called returns an error, as there will be no corresponding call to the NLM. For details, simply check the if/else on do_setlk and do_unlk on fs/nfs/file.c.

fs/nfs/file.c +0 -4
@@ -723,10 +723,6 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl)
 		default:
 			BUG();
 	}
-	if (res < 0)
-		dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"
-			" - error %d!\n",
-				__func__, res);
 	return res;
 }
 

Please keep me copied as I don't subscribe to the list.

Regards,
Fábio Olivé

Signature · 2 lines
TcheLinux.org, OeSC-Livre.org, Chapecó, SC
ex sed lex awk yacc, e pluribus unix, amem
#2 lore raw
In reply to a message not in the archive

Looks right to me.

fs/nfs/file.c static int do_vfs_lock(struct file *file, struct=

Quoted 13 lines · Fabio Olive Leite

The do_vfs_lock function on fs/nfs/file.c is only called if NLM is not being used, via the -onolock mount option. Therefore it cannot really be "out of sync with lock manager" when the local locking function called returns an error, as there will be no corresponding call to the NLM. For details, simply check the if/else on do_setlk and do_unlk on fs/nfs/file.c.
=20

=20

fs/nfs/file.c +0 -0
@@ -723,10 +723,6 @@ static int do_vfs_lock(struct file *file, struct=

file_lock *fl)

Quoted 12 lines
fs/nfs/file.c +0 -4
 		default:
 			BUG();
 	}
-	if (res < 0)
-		dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"
-			" - error %d!\n",
-				__func__, res);
 	return res;
 }

=20
=20
Please keep me copied as I don't subscribe to the list.

Quoted 8 lines

=20
Regards,
F=C3=A1bio Oliv=C3=A9
--=20
TcheLinux.org, OeSC-Livre.org, Chapec=C3=B3, SC
ex sed lex awk yacc, e pluribus unix, amem
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" =

in

Quoted 2 lines

the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Reviewed-by
#3 lore raw
In reply to a message not in the archive

fs/nfs/file.c static int do_vfs_lock(struct file *file, struct=

Quoted 13 lines · On Tue, 7 Sep 2010 02:56:01 -0300 =46abio Olive Leite <[email protected]> wrote:

The do_vfs_lock function on fs/nfs/file.c is only called if NLM is not being used, via the -onolock mount option. Therefore it cannot really be "out of sync with lock manager" when the local locking function called returns an error, as there will be no corresponding call to the NLM. For details, simply check the if/else on do_setlk and do_unlk on fs/nfs/file.c.
=20

=20

fs/nfs/file.c +0 -0
@@ -723,10 +723,6 @@ static int do_vfs_lock(struct file *file, struct=

file_lock *fl)

Quoted 9 lines
fs/nfs/file.c +0 -4
 		default:
 			BUG();
 	}
-	if (res < 0)
-		dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"
-			" - error %d!\n",
-				__func__, res);
 	return res;
 }
Quoted 6 lines

=20
=20
Please keep me copied as I don't subscribe to the list. =20
Regards,
F=E1bio Oliv=E9

#5 lore raw
In reply to a message not in the archive
Quoted 16 lines · Jeff Layton

On Tue, 7 Sep 2010 02:56:01 -0300
Fabio Olive Leite <[email protected]> wrote:
=20

fs/nfs/file.c static int do_vfs_lock(struct file *file, stru=

Quoted 13 lines

The do_vfs_lock function on fs/nfs/file.c is only called if NLM is not being used, via the -onolock mount option. Therefore it cannot really be "out of sync with lock manager" when the local locking function called returns an error, as there will be no corresponding call to the NLM. For details, simply check the if/else on do_setlk and do_unlk on fs/nfs/file.c.
=20

=20

fs/nfs/file.c +0 -0
@@ -723,10 +723,6 @@ static int do_vfs_lock(struct file *file, stru=

ct file_lock *fl)

Quoted 16 lines
Quoted 9 lines
fs/nfs/file.c +0 -4
 		default:
 			BUG();
 	}
-	if (res < 0)
-		dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"
-			" - error %d!\n",
-				__func__, res);
 	return res;
 }
Quoted 6 lines

=20
=20
Please keep me copied as I don't subscribe to the list. =20
Regards,
F=C3=A1bio Oliv=C3=A9

=20

Quoted 1 line

Applied (after removing the ^M)...

Trond