Skip to contentSkip to conversation

2.6.27 broken

NLM Frank van Maarseveen 3 participants 15 messages Nov 15, 2008 – Feb 9, 2009

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

Try running multiple instances of attached program on 1 NFS client against a 2.6.27(.5) NFSv3 server:

gcc -Wall -Wstrict-prototypes -o lck lck.c for i in seq 30
do
lck &
done

Depending on the client linux version one or more processes hang indefinately (on 2.6.22) or receive a ENOLCK (on 2.6.27), printing:

lck: fcntl: No locks available

Either way, /proc/locks on the server grows indefinately.

Signature · 1 line
Frank

#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <stdarg.h>
#include <stdlib.h>

void die(const char *fmt, ...) __attribute__((format(printf, 1, 2), noreturn)); void die(const char *fmt, ...)

{
	va_list	ap;

	va_start(ap, fmt);
	fprintf(stderr, "lck: ");
	vfprintf(stderr, fmt, ap);
	va_end(ap);
	exit(1);
}

int main(int argc, char **argv)

{
	struct flock flock = {0};
	int i, d, locktime, cmd;
	const char *name;

	flock.l_type = F_WRLCK;		/* -w */
	flock.l_whence = SEEK_SET;
	cmd = F_SETLKW;			/* no -t */
	name = NULL;
	locktime = 10;
	for (i = 1; i < argc; ++i) {
		if (strcmp(argv[i], "-r") == 0)
			flock.l_type = F_RDLCK;		/* lock for N readers */
		else if (strcmp(argv[i], "-w") == 0)
			flock.l_type = F_WRLCK;		/* lock for 1 writer */
		else if (strcmp(argv[i], "-t") == 0)
			cmd = F_SETLK;			/* test for a lock, don't wait */
		else if (argv[i][0] == '-')
			die("Usage: lck [-r|-w] [-t] [<filename> [<locktime>]]\n");
		else if (name && isdigit(argv[i][0]))
			locktime = atoi(argv[i]);	/* after acquiring lock, wait locktime seconds */
		else
			name = argv[i];
	}
	if (!name)
		name = "lck-filename";
	d = open(name, O_RDWR|O_CREAT, 0666);
	if (d == -1)
		die("open %s: %s\n", name, strerror(errno));
	if (fcntl(d, cmd, &flock) == -1)
		die("fcntl: %s\n", strerror(errno));
	printf("locked...");
	fflush(NULL);
	sleep(locktime);
	if (close(d))
		die("close: %s\n", strerror(errno));
	printf("unlocked.\n");
	return 0;
}
#1 lore raw
Quoted 8 lines · Frank van Maarseveen

Try running multiple instances of attached program on 1 NFS client against a 2.6.27(.5) NFSv3 server:

gcc -Wall -Wstrict-prototypes -o lck lck.c for i in seq 30
do
lck &
done

Or reproduceable using the "flock" utility with:

for i in seq 30
do
flock /mnt/foo sleep 10
done

Hm. What's the last known good server version?

--b.

Quoted 72 lines

Depending on the client linux version one or more processes hang indefinately (on 2.6.22) or receive a ENOLCK (on 2.6.27), printing:

lck: fcntl: No locks available

Either way, /proc/locks on the server grows indefinately.

Signature · 63 lines
Frank

#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <stdarg.h>
#include <stdlib.h>

void die(const char *fmt, ...) __attribute__((format(printf, 1, 2), noreturn));
void die(const char *fmt, ...)
{
	va_list	ap;

	va_start(ap, fmt);
	fprintf(stderr, "lck: ");
	vfprintf(stderr, fmt, ap);
	va_end(ap);
	exit(1);
}

int main(int argc, char **argv)
{
	struct flock flock = {0};
	int i, d, locktime, cmd;
	const char *name;

	flock.l_type = F_WRLCK;		/* -w */
	flock.l_whence = SEEK_SET;
	cmd = F_SETLKW;			/* no -t */
	name = NULL;
	locktime = 10;
	for (i = 1; i < argc; ++i) {
		if (strcmp(argv[i], "-r") == 0)
			flock.l_type = F_RDLCK;		/* lock for N readers */
		else if (strcmp(argv[i], "-w") == 0)
			flock.l_type = F_WRLCK;		/* lock for 1 writer */
		else if (strcmp(argv[i], "-t") == 0)
			cmd = F_SETLK;			/* test for a lock, don't wait */
		else if (argv[i][0] == '-')
			die("Usage: lck [-r|-w] [-t] [<filename> [<locktime>]]\n");
		else if (name && isdigit(argv[i][0]))
			locktime = atoi(argv[i]);	/* after acquiring lock, wait locktime seconds */
		else
			name = argv[i];
	}
	if (!name)
		name = "lck-filename";
	d = open(name, O_RDWR|O_CREAT, 0666);
	if (d == -1)
		die("open %s: %s\n", name, strerror(errno));
	if (fcntl(d, cmd, &flock) == -1)
		die("fcntl: %s\n", strerror(errno));
	printf("locked...");
	fflush(NULL);
	sleep(locktime);
	if (close(d))
		die("close: %s\n", strerror(errno));
	printf("unlocked.\n");
	return 0;
}
#2 lore raw
Quoted 10 lines · J. Bruce Fields
Quoted 8 lines · Frank van Maarseveen

Try running multiple instances of attached program on 1 NFS client against a 2.6.27(.5) NFSv3 server:

gcc -Wall -Wstrict-prototypes -o lck lck.c for i in seq 30
do
lck &
done

Quoted 8 lines

Or reproduceable using the "flock" utility with:

for i in seq 30
do
flock /mnt/foo sleep 10
done

Hm. What's the last known good server version?

2.6.24.4

Signature · 1 line
Frank
#3 lore raw
Quoted 11 lines · Frank van Maarseveen
Quoted 10 lines · J. Bruce Fields
Quoted 8 lines · Frank van Maarseveen

Try running multiple instances of attached program on 1 NFS client against a 2.6.27(.5) NFSv3 server:

gcc -Wall -Wstrict-prototypes -o lck lck.c for i in seq 30
do
lck &
done

Quoted 5 lines
Quoted 5 lines

Or reproduceable using the "flock" utility with:

for i in seq 30
do
flock /mnt/foo sleep 10

(Sorry, note there should be an ampersand at the end there....)

Quoted 5 lines
Quoted 3 lines

done

Hm. What's the last known good server version?

2.6.24.4

More precisely, it looks like this started with

bde74e4bc64415b142e "locks: add special return value for
asynchronous locks"

But I haven't had the chance to look any harder yet. Miklos? Is this easy for you to reproduce?

--b.

#4 lore raw
Quoted 7 lines · J. Bruce Fields

More precisely, it looks like this started with

bde74e4bc64415b142e "locks: add special return value for
asynchronous locks"

But I haven't had the chance to look any harder yet. Miklos? Is this easy for you to reproduce?

Not immediately, at the moment I don't have NFS set up. But if you don't beat me to it, I'll look into this.

Thanks,
Miklos

#5 lore raw
Quoted 11 lines · Miklos Szeredi
Quoted 7 lines · J. Bruce Fields

More precisely, it looks like this started with

bde74e4bc64415b142e "locks: add special return value for
asynchronous locks"

But I haven't had the chance to look any harder yet. Miklos? Is this easy for you to reproduce?

Not immediately, at the moment I don't have NFS set up. But if you don't beat me to it, I'll look into this.

OK, thanks. I'll take another look too when I get the chance, so let me know of any partial result.

It may just for example be returning the wrong error to the client on an nlm blocking lock request, so that the client assumes the lock is gone and goes away rather than waiting for a grant request.

--b.

#6 lore raw
Quoted 13 lines · bfields
Quoted 11 lines · Miklos Szeredi
Quoted 7 lines · J. Bruce Fields

More precisely, it looks like this started with

bde74e4bc64415b142e "locks: add special return value for
asynchronous locks"

But I haven't had the chance to look any harder yet. Miklos? Is this easy for you to reproduce?

Not immediately, at the moment I don't have NFS set up. But if you don't beat me to it, I'll look into this.

Quoted 6 lines

OK, thanks. I'll take another look too when I get the chance, so let me know of any partial result.

It may just for example be returning the wrong error to the client on an nlm blocking lock request, so that the client assumes the lock is gone and goes away rather than waiting for a grant request.

Sorry, I've gotten a bit backlogged, but I finally got back to this. If there's no objections, the following is what I intend to submit.

--b.

commit cb8b864ea6addd3a3e72fe835aafecec63f06cbd

Author: J. Bruce Fields <[email protected]>
Date:   Wed Feb 4 17:35:38 2009 -0500

lockd: fix regression in lockd's handling of blocked locks

If a client requests a blocking lock, is denied, then requests it again, then here in nlmsvc_lock() we will call vfs_lock_file() without FL_SLEEP set, because we've already queued a block and don't need the locks code to do it again.

But that means vfs_lock_file() will return -EAGAIN instead of FILE_LOCK_DENIED. So we still need to translate that -EAGAIN return into a nlm_lck_blocked error in this case, and put ourselves back on lockd's block list.

The bug was introduced by bde74e4bc64415b1 "locks: add special return value for asynchronous locks".

Thanks to From: Frank van Maarseveen for the report; his original test case was essentially

for i in seq 30; do flock /nfsmount/foo sleep 10 & done

Cc Frank van Maarseveen <[email protected]>
Cc Miklos Szeredi <[email protected]>
fs/lockd/svclock.c +5 -1
index 6063a8e..763b78a 100644
@@ -427,7 +427,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 		case -EAGAIN:
 			ret = nlm_lck_denied;
-			goto out;
+			break;
 		case FILE_LOCK_DEFERRED:
 			if (wait)
 				break;
@@ -443,6 +443,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 	}
 
+	ret = nlm_lck_denied;
+	if (!wait)
+		goto out;
+
 	ret = nlm_lck_blocked;
 
 	/* Append to list of blocked */
#7 lore raw
Quoted 17 lines · J. Bruce Fields
Quoted 16 lines · bfields
Quoted 11 lines · Miklos Szeredi
Quoted 7 lines · J. Bruce Fields

More precisely, it looks like this started with

bde74e4bc64415b142e "locks: add special return value for
asynchronous locks"

But I haven't had the chance to look any harder yet. Miklos? Is this easy for you to reproduce?

Not immediately, at the moment I don't have NFS set up. But if you don't beat me to it, I'll look into this.

OK, thanks. I'll take another look too when I get the chance, so let me know of any partial result.

Quoted 6 lines
Quoted 3 lines

It may just for example be returning the wrong error to the client on an nlm blocking lock request, so that the client assumes the lock is gone and goes away rather than waiting for a grant request.

Sorry, I've gotten a bit backlogged, but I finally got back to this. If there's no objections, the following is what I intend to submit.

OK (though I don't really understand why we make a lock request to the VFS _at all_ if we know the lock is already queued???).

But I think at least a comment in the code would be in order, or this same mistake might be made again. Also I think the original code flow is somewhat illogical.

How about this (it's essentially the same patch just a bit rearranged, the authorship is still yours of course ;)

Thanks,
Miklos

fs/lockd/svclock.c +7 -0
Index: linux-2.6/fs/lockd/svclock.c
===================================================================
@@ -426,6 +426,13 @@ nlmsvc_lock(struct svc_rqst *rqstp, stru
 			ret = nlm_granted;
 			goto out;
 		case -EAGAIN:
+			/*
+			 * If this is a blocking request for an
+			 * already pending lock request then we need
+			 * to put it back on lockd's block list
+			 */
+			if (wait)
+				break;
 			ret = nlm_lck_denied;
 			goto out;
 		case FILE_LOCK_DEFERRED:
#13 lore raw
In reply to J. Bruce Fields
Quoted 68 lines · J. Bruce Fields
Quoted 13 lines · bfields
Quoted 11 lines · Miklos Szeredi
Quoted 7 lines · J. Bruce Fields

More precisely, it looks like this started with

bde74e4bc64415b142e "locks: add special return value for
asynchronous locks"

But I haven't had the chance to look any harder yet. Miklos? Is this easy for you to reproduce?

Not immediately, at the moment I don't have NFS set up. But if you don't beat me to it, I'll look into this.

Quoted 6 lines

OK, thanks. I'll take another look too when I get the chance, so let me know of any partial result.

It may just for example be returning the wrong error to the client on an nlm blocking lock request, so that the client assumes the lock is gone and goes away rather than waiting for a grant request.

Sorry, I've gotten a bit backlogged, but I finally got back to this. If there's no objections, the following is what I intend to submit.

--b.

commit cb8b864ea6addd3a3e72fe835aafecec63f06cbd

Author: J. Bruce Fields <[email protected]>
Date:   Wed Feb 4 17:35:38 2009 -0500

lockd: fix regression in lockd's handling of blocked locks

If a client requests a blocking lock, is denied, then requests it again, then here in nlmsvc_lock() we will call vfs_lock_file() without FL_SLEEP set, because we've already queued a block and don't need the locks code to do it again.

But that means vfs_lock_file() will return -EAGAIN instead of FILE_LOCK_DENIED. So we still need to translate that -EAGAIN return into a nlm_lck_blocked error in this case, and put ourselves back on lockd's block list.

The bug was introduced by bde74e4bc64415b1 "locks: add special return value for asynchronous locks".

Thanks to From: Frank van Maarseveen for the report; his original test case was essentially

for i in seq 30; do flock /nfsmount/foo sleep 10 & done

Cc Frank van Maarseveen <[email protected]>
Cc Miklos Szeredi <[email protected]>
fs/lockd/svclock.c +1 -1
index 6063a8e..763b78a 100644
@@ -427,7 +427,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 		case -EAGAIN:
 			ret = nlm_lck_denied;
-			goto out;
+			break;
 		case FILE_LOCK_DEFERRED:
 			if (wait)
 				break;

fs/lockd/svclock.c nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, · line 452

Quoted 10 lines
fs/lockd/svclock.c +4 -0
@@ -443,6 +443,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 	}
 
+	ret = nlm_lck_denied;
+	if (!wait)
+		goto out;
+
 	ret = nlm_lck_blocked;
 
 	/* Append to list of blocked */

fix confirmed, thanks!

Signature · 1 line
Frank
#8 lore raw
In reply to Miklos Szeredi
Quoted 22 lines · Miklos Szeredi
Quoted 21 lines · J. Bruce Fields
Quoted 19 lines · bfields
Quoted 11 lines · Miklos Szeredi
Quoted 7 lines · J. Bruce Fields

More precisely, it looks like this started with

bde74e4bc64415b142e "locks: add special return value for
asynchronous locks"

But I haven't had the chance to look any harder yet. Miklos? Is this easy for you to reproduce?

Not immediately, at the moment I don't have NFS set up. But if you don't beat me to it, I'll look into this.

OK, thanks. I'll take another look too when I get the chance, so let me know of any partial result.

It may just for example be returning the wrong error to the client on an nlm blocking lock request, so that the client assumes the lock is gone and goes away rather than waiting for a grant request.

Quoted 5 lines
Quoted 2 lines

Sorry, I've gotten a bit backlogged, but I finally got back to this. If there's no objections, the following is what I intend to submit.

OK (though I don't really understand why we make a lock request to the VFS _at all_ if we know the lock is already queued???).

I think you're right, we might be able to bypass the lock entirely in that case, but we'd need to think about it carefully.

Quoted 3 lines

But I think at least a comment in the code would be in order, or this same mistake might be made again. Also I think the original code flow is somewhat illogical.

Yeah, I was literally just reverting the problematic lines of your previous commit. I'd rather keep it that way for now, just as a clear separation between the revert/bugfix and the cleanup.

Quoted 2 lines

How about this (it's essentially the same patch just a bit rearranged, the authorship is still yours of course ;)

... but would happily queue up the cleanup for 2.6.30.

Actually, I find it strange to have just that single case which breaks, so that the code after the switch, which looks like it should be shared, actually just applies to one case. I'd be inclined to just suck everything up to "out:" into the -EAGAIN case and then make all cases "goto out" (or, equivalently, break).

--b.

Quoted 25 lines

Thanks,
Miklos

Index: linux-2.6/fs/lockd/svclock.c
===================================================================

fs/lockd/svclock.c +7 -0
@@ -426,6 +426,13 @@ nlmsvc_lock(struct svc_rqst *rqstp, stru
 			ret = nlm_granted;
 			goto out;
 		case -EAGAIN:
+			/*
+			 * If this is a blocking request for an
+			 * already pending lock request then we need
+			 * to put it back on lockd's block list
+			 */
+			if (wait)
+				break;
 			ret = nlm_lck_denied;
 			goto out;
 		case FILE_LOCK_DEFERRED:
#14 lore raw
In reply to Frank van Maarseveen
Quoted 24 lines · Frank van Maarseveen
Quoted 23 lines · J. Bruce Fields
fs/lockd/svclock.c +5 -1
index 6063a8e..763b78a 100644
@@ -427,7 +427,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 		case -EAGAIN:
 			ret = nlm_lck_denied;
-			goto out;
+			break;
 		case FILE_LOCK_DEFERRED:
 			if (wait)
 				break;
@@ -443,6 +443,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 	}
 
+	ret = nlm_lck_denied;
+	if (!wait)
+		goto out;
+
 	ret = nlm_lck_blocked;
 
Quoted 4 lines

fs/lockd/svclock.c nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file, · line 452

Quoted 1 line
fs/lockd/svclock.c +0 -0
 	/* Append to list of blocked */

fix confirmed, thanks!

Good, thanks.--b.

#9 lore raw
In reply to J. Bruce Fields
Quoted 8 lines · J. Bruce Fields
Quoted 3 lines · Miklos Szeredi

But I think at least a comment in the code would be in order, or this same mistake might be made again. Also I think the original code flow is somewhat illogical.

Yeah, I was literally just reverting the problematic lines of your previous commit. I'd rather keep it that way for now, just as a clear separation between the revert/bugfix and the cleanup.

OK.

Quoted 4 lines
Quoted 2 lines

How about this (it's essentially the same patch just a bit rearranged, the authorship is still yours of course ;)

... but would happily queue up the cleanup for 2.6.30.

Cool.

Quoted 5 lines

Actually, I find it strange to have just that single case which breaks, so that the code after the switch, which looks like it should be shared, actually just applies to one case. I'd be inclined to just suck everything up to "out:" into the -EAGAIN case and then make all cases "goto out" (or, equivalently, break).

Yes, but it needs to be sucked into the FILE_LOCK_DEFERRED case as well. It's just two lines and one of them is setting the error value, so it's not real duplication.

Thanks,
Miklos

Tested-by Frank van Maarseveen
#10 lore raw
Quoted 25 lines · Miklos Szeredi
Quoted 8 lines · J. Bruce Fields
Quoted 3 lines · Miklos Szeredi

But I think at least a comment in the code would be in order, or this same mistake might be made again. Also I think the original code flow is somewhat illogical.

Yeah, I was literally just reverting the problematic lines of your previous commit. I'd rather keep it that way for now, just as a clear separation between the revert/bugfix and the cleanup.

OK.

Quoted 4 lines
Quoted 2 lines

How about this (it's essentially the same patch just a bit rearranged, the authorship is still yours of course ;)

... but would happily queue up the cleanup for 2.6.30.

Cool.

Quoted 5 lines

Actually, I find it strange to have just that single case which breaks, so that the code after the switch, which looks like it should be shared, actually just applies to one case. I'd be inclined to just suck everything up to "out:" into the -EAGAIN case and then make all cases "goto out" (or, equivalently, break).

Quoted 3 lines

Yes, but it needs to be sucked into the FILE_LOCK_DEFERRED case as well. It's just two lines and one of them is setting the error value, so it's not real duplication.

Whoops, right, missed that; so, I'm applying the below, sending the fixup in now, and queuing up the cleanup for 2.6.30 (with the blame assigned back to you, hah--object or have me add your signed-off-by).

--b.

commit c4a06d0957ea5b386b1cd83fa9a9d6c19b736346

Author: Miklos Szeredi <[email protected]>
Date:   Mon Feb 9 12:30:43 2009 -0500

lockd: clean up blocking lock cases of nlsmvc_lock()

No change in behavior, just rearranging the switch so that we break out of the switch if and only if we're in the wait case.

fs/lockd/svclock.c +8 -5
index 763b78a..83ee342 100644
@@ -426,8 +426,15 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			ret = nlm_granted;
 			goto out;
 		case -EAGAIN:
+			/*
+			 * If this is a blocking request for an
+			 * already pending lock request then we need
+			 * to put it back on lockd's block list
+			 */
+			if (wait)
+				break;
 			ret = nlm_lck_denied;
-			break;
+			goto out;
 		case FILE_LOCK_DEFERRED:
 			if (wait)
 				break;
@@ -443,10 +450,6 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 	}
 
-	ret = nlm_lck_denied;
-	if (!wait)
-		goto out;
-
 	ret = nlm_lck_blocked;
 
 	/* Append to list of blocked */

commit 716cb6d7901f92bdfe1c80dbf4765027dceab384

Author: J. Bruce Fields <[email protected]>
Date:   Wed Feb 4 17:35:38 2009 -0500

lockd: fix regression in lockd's handling of blocked locks

If a client requests a blocking lock, is denied, then requests it again, then here in nlmsvc_lock() we will call vfs_lock_file() without FL_SLEEP set, because we've already queued a block and don't need the locks code to do it again.

But that means vfs_lock_file() will return -EAGAIN instead of FILE_LOCK_DENIED. So we still need to translate that -EAGAIN return into a nlm_lck_blocked error in this case, and put ourselves back on lockd's block list.

The bug was introduced by bde74e4bc64415b1 "locks: add special return value for asynchronous locks".

Thanks to From: Frank van Maarseveen for the report; his original test case was essentially

for i in seq 30; do flock /nfsmount/foo sleep 10 & done

fs/lockd/svclock.c +5 -1
index 6063a8e..763b78a 100644
@@ -427,7 +427,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 		case -EAGAIN:
 			ret = nlm_lck_denied;
-			goto out;
+			break;
 		case FILE_LOCK_DEFERRED:
 			if (wait)
 				break;
@@ -443,6 +443,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 	}
 
+	ret = nlm_lck_denied;
+	if (!wait)
+		goto out;
+
 	ret = nlm_lck_blocked;
 
 	/* Append to list of blocked */
#11 lore raw
Quoted 26 lines · J. Bruce Fields
Quoted 25 lines · Miklos Szeredi
Quoted 8 lines · J. Bruce Fields
Quoted 3 lines · Miklos Szeredi

But I think at least a comment in the code would be in order, or this same mistake might be made again. Also I think the original code flow is somewhat illogical.

Yeah, I was literally just reverting the problematic lines of your previous commit. I'd rather keep it that way for now, just as a clear separation between the revert/bugfix and the cleanup.

OK.

Quoted 4 lines
Quoted 2 lines

How about this (it's essentially the same patch just a bit rearranged, the authorship is still yours of course ;)

... but would happily queue up the cleanup for 2.6.30.

Cool.

Quoted 5 lines

Actually, I find it strange to have just that single case which breaks, so that the code after the switch, which looks like it should be shared, actually just applies to one case. I'd be inclined to just suck everything up to "out:" into the -EAGAIN case and then make all cases "goto out" (or, equivalently, break).

Quoted 7 lines
Quoted 3 lines

Yes, but it needs to be sucked into the FILE_LOCK_DEFERRED case as well. It's just two lines and one of them is setting the error value, so it's not real duplication.

Whoops, right, missed that; so, I'm applying the below, sending the fixup in now, and queuing up the cleanup for 2.6.30 (with the blame assigned back to you, hah--object or have me add your signed-off-by).

No objections :)

BTW, one tip for stable patches: if you add a "Cc: [email protected]" line to the Signed-off-by block, then it will ease the patch's way into the stable kernels as it will automatically be picked up by Greg's scripts when it hits the mainline tree.

Thanks,
Miklos

#12 lore raw
Quoted 35 lines · Miklos Szeredi
Quoted 26 lines · J. Bruce Fields
Quoted 25 lines · Miklos Szeredi
Quoted 8 lines · J. Bruce Fields
Quoted 3 lines · Miklos Szeredi

But I think at least a comment in the code would be in order, or this same mistake might be made again. Also I think the original code flow is somewhat illogical.

Yeah, I was literally just reverting the problematic lines of your previous commit. I'd rather keep it that way for now, just as a clear separation between the revert/bugfix and the cleanup.

OK.

Quoted 4 lines
Quoted 2 lines

How about this (it's essentially the same patch just a bit rearranged, the authorship is still yours of course ;)

... but would happily queue up the cleanup for 2.6.30.

Cool.

Quoted 5 lines

Actually, I find it strange to have just that single case which breaks, so that the code after the switch, which looks like it should be shared, actually just applies to one case. I'd be inclined to just suck everything up to "out:" into the -EAGAIN case and then make all cases "goto out" (or, equivalently, break).

Quoted 7 lines
Quoted 3 lines

Yes, but it needs to be sucked into the FILE_LOCK_DEFERRED case as well. It's just two lines and one of them is setting the error value, so it's not real duplication.

Whoops, right, missed that; so, I'm applying the below, sending the fixup in now, and queuing up the cleanup for 2.6.30 (with the blame assigned back to you, hah--object or have me add your signed-off-by).

Quoted 8 lines

No objections :)

BTW, one tip for stable patches: if you add a "Cc: [email protected]" line to the Signed-off-by block, then it will ease the patch's way into the stable kernels as it will automatically be picked up by Greg's scripts when it hits the mainline tree.

Thanks! I do cc: [email protected], but hadn't thought of adding that to the changelog itself--makes sense, I'll do that next time.

--b.