Skip to contentSkip to conversation

fctnl(F_SETSIG) no longer works in 2.6.17, does in 2.6.16.

DISCUSSION Chuck Ebbert 3 participants 3 messages Jul 31, 2006 – Aug 1, 2006

lore
Share & tools
lore
#0 lore raw

In-Reply-To: <[email protected]>

Quoted 4 lines · Orion Poplawski

fctnl(F_SETSIG) no longer works in 2.6.17, does in 2.6.16.

The attached program (oplocktest.c) illustrates.

I added some debug statements to your code:

=>      printf("before setlease: signal number = %d\n", fcntl(fd, F_GETSIG));
        ret = fcntl(fd, F_SETLEASE, leasetype);
        if (ret == -1 && errno == EACCES) {
                set_capability(CAP_LEASE);
                ret = fcntl(fd, F_SETLEASE, leasetype);
        }

=> printf("after setlease: signal number = %d\n", fcntl(fd, F_GETSIG));

And I get:

before setlease: signal number = 34
after setlease: signal number = 0

So the fcntl(F_SETLEASE) is resetting the signal number. I don't think it's supposed to do that.

That seems to be caused by:

| From: Trond Myklebust <[email protected]>
| Date: Mon, 20 Mar 2006 18:44:05 +0000 (-0500)
| Subject: VFS: Fix __posix_lock_file() copy of private lock area
| X-Git-Tag: v2.6.17-rc1
| X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=47831
|
| VFS: Fix __posix_lock_file() copy of private lock area
|
| The struct file_lock->fl_u area must be copied using the fl_copy_lock()
| operation.

In this change:

|  */
| void locks_copy_lock(struct file_lock *new, struct file_lock *fl)
| {
|+       locks_release_private(new);
|+
|        new->fl_owner = fl->fl_owner;
|        new->fl_pid = fl->fl_pid;
|        new->fl_file = fl->fl_file;

Which ends up calling this:

static void lease_release_private_callback(struct file_lock *fl)

{
        if (!fl->fl_file)
                return;

        f_delown(fl->fl_file);

=> fl->fl_file->f_owner.signum = 0;
}

I'm not sure how to fix it, though (if that's really the problem, but I think it is.)

Signature · 1 line
Chuck
#1 lore raw
Quoted 8 lines · Chuck Ebbert

static void lease_release_private_callback(struct file_lock *fl)

{
        if (!fl->fl_file)
                return;

        f_delown(fl->fl_file);

=> fl->fl_file->f_owner.signum = 0;
}

Why should the lease cleanup code be resetting f_owner.signum? That looks wrong.

Stephen, I think this line of code predates the CITI changes. Do you know who added it and why?

Cheers,
Trond

#2 lore raw
Quoted 12 lines · On Mon, 31 Jul 2006 11:23:52 -0700 Trond Myklebust…
Quoted 8 lines · Chuck Ebbert

static void lease_release_private_callback(struct file_lock *fl)

{
        if (!fl->fl_file)
                return;

        f_delown(fl->fl_file);

=> fl->fl_file->f_owner.signum = 0;
}

Quoted 5 lines

Why should the lease cleanup code be resetting f_owner.signum? That looks wrong.

Stephen, I think this line of code predates the CITI changes. Do you know who added it and why?

Because when the original code was written, it was only called when we got a fcntl(F_SETLEASE, F_UNLCK) call. The code got moved incorrectly and noone noticed.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/