* [PATCH] move BKL down a little in setfl
@ 2002-08-21 22:42 Matthew Wilcox
2002-08-21 22:50 ` Linus Torvalds
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Wilcox @ 2002-08-21 22:42 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
Nothing spectacular here, just push the BKL down a little.
diff -urpNX dontdiff linux-2.5.31/fs/fcntl.c linux-2.5.31-willy/fs/fcntl.c
--- linux-2.5.31/fs/fcntl.c 2002-08-01 14:16:07.000000000 -0700
+++ linux-2.5.31-willy/fs/fcntl.c 2002-08-18 14:06:35.000000000 -0700
@@ -227,23 +227,15 @@ asmlinkage long sys_dup(unsigned int fil
static int setfl(int fd, struct file * filp, unsigned long arg)
{
struct inode * inode = filp->f_dentry->d_inode;
- int error;
- /*
- * In the case of an append-only file, O_APPEND
- * cannot be cleared
- */
+ /* O_APPEND cannot be cleared if the file is marked as append-only */
if (!(arg & O_APPEND) && IS_APPEND(inode))
return -EPERM;
- /* Did FASYNC state change? */
- if ((arg ^ filp->f_flags) & FASYNC) {
- if (filp->f_op && filp->f_op->fasync) {
- error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
- if (error < 0)
- return error;
- }
- }
+ /* required for strict SunOS emulation */
+ if (O_NONBLOCK != O_NDELAY)
+ if (arg & O_NDELAY)
+ arg |= O_NONBLOCK;
if (arg & O_DIRECT) {
if (!inode->i_mapping || !inode->i_mapping->a_ops ||
@@ -251,12 +243,18 @@ static int setfl(int fd, struct file * f
return -EINVAL;
}
- /* required for strict SunOS emulation */
- if (O_NONBLOCK != O_NDELAY)
- if (arg & O_NDELAY)
- arg |= O_NONBLOCK;
+ lock_kernel();
+ if ((arg ^ filp->f_flags) & FASYNC) {
+ if (filp->f_op && filp->f_op->fasync) {
+ int error;
+ error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
+ if (error < 0)
+ return error;
+ }
+ }
filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK);
+ unlock_kernel();
return 0;
}
@@ -283,9 +281,7 @@ static long do_fcntl(unsigned int fd, un
err = filp->f_flags;
break;
case F_SETFL:
- lock_kernel();
err = setfl(fd, filp, arg);
- unlock_kernel();
break;
case F_GETLK:
err = fcntl_getlk(filp, (struct flock *) arg);
--
Revolutions do not require corporate support.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] move BKL down a little in setfl
2002-08-21 22:42 [PATCH] move BKL down a little in setfl Matthew Wilcox
@ 2002-08-21 22:50 ` Linus Torvalds
2002-08-22 1:45 ` Matthew Wilcox
0 siblings, 1 reply; 3+ messages in thread
From: Linus Torvalds @ 2002-08-21 22:50 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: linux-kernel
On Wed, 21 Aug 2002, Matthew Wilcox wrote:
>
> Nothing spectacular here, just push the BKL down a little.
This exits with the BKL held, as far as I can tell:
> + lock_kernel();
> + if ((arg ^ filp->f_flags) & FASYNC) {
> + if (filp->f_op && filp->f_op->fasync) {
> + int error;
> + error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
> + if (error < 0)
> + return error;
^^^^^^^^^^^^
Here.
Linus
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] move BKL down a little in setfl
2002-08-21 22:50 ` Linus Torvalds
@ 2002-08-22 1:45 ` Matthew Wilcox
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Wilcox @ 2002-08-22 1:45 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Matthew Wilcox, linux-kernel
On Wed, Aug 21, 2002 at 03:50:27PM -0700, Linus Torvalds wrote:
> This exits with the BKL held, as far as I can tell:
duh, you're right. here's a fixed patch:
diff -urpNX dontdiff linux-2.5.31/fs/fcntl.c linux-2.5.31-willy/fs/fcntl.c
--- linux-2.5.31/fs/fcntl.c 2002-08-01 14:16:07.000000000 -0700
+++ linux-2.5.31-willy/fs/fcntl.c 2002-08-21 18:32:37.000000000 -0700
@@ -227,23 +227,16 @@ asmlinkage long sys_dup(unsigned int fil
static int setfl(int fd, struct file * filp, unsigned long arg)
{
struct inode * inode = filp->f_dentry->d_inode;
- int error;
+ int error = 0;
- /*
- * In the case of an append-only file, O_APPEND
- * cannot be cleared
- */
+ /* O_APPEND cannot be cleared if the file is marked as append-only */
if (!(arg & O_APPEND) && IS_APPEND(inode))
return -EPERM;
- /* Did FASYNC state change? */
- if ((arg ^ filp->f_flags) & FASYNC) {
- if (filp->f_op && filp->f_op->fasync) {
- error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
- if (error < 0)
- return error;
- }
- }
+ /* required for strict SunOS emulation */
+ if (O_NONBLOCK != O_NDELAY)
+ if (arg & O_NDELAY)
+ arg |= O_NONBLOCK;
if (arg & O_DIRECT) {
if (!inode->i_mapping || !inode->i_mapping->a_ops ||
@@ -251,13 +244,19 @@ static int setfl(int fd, struct file * f
return -EINVAL;
}
- /* required for strict SunOS emulation */
- if (O_NONBLOCK != O_NDELAY)
- if (arg & O_NDELAY)
- arg |= O_NONBLOCK;
+ lock_kernel();
+ if ((arg ^ filp->f_flags) & FASYNC) {
+ if (filp->f_op && filp->f_op->fasync) {
+ error = filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0);
+ if (error < 0)
+ goto out;
+ }
+ }
filp->f_flags = (arg & SETFL_MASK) | (filp->f_flags & ~SETFL_MASK);
- return 0;
+ out:
+ unlock_kernel();
+ return error;
}
static long do_fcntl(unsigned int fd, unsigned int cmd,
@@ -283,9 +282,7 @@ static long do_fcntl(unsigned int fd, un
err = filp->f_flags;
break;
case F_SETFL:
- lock_kernel();
err = setfl(fd, filp, arg);
- unlock_kernel();
break;
case F_GETLK:
err = fcntl_getlk(filp, (struct flock *) arg);
--
Revolutions do not require corporate support.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2002-08-22 1:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-08-21 22:42 [PATCH] move BKL down a little in setfl Matthew Wilcox
2002-08-21 22:50 ` Linus Torvalds
2002-08-22 1:45 ` Matthew Wilcox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®