diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:47:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:47:52 +0100 |
| commit | 4f16d4e0c9a4b20d9f0db365587b96d6001efd7d (patch) | |
| tree | fa25dcf285b26f1fac2bf267d0d1cd2c4eba90b8 /fs/fcntl.c | |
| parent | 1e259e0a9982078896f3404240096cbea01daca4 (diff) | |
| parent | 6630125419ef37ff8781713c5e9d416f2a4ba357 (diff) | |
| download | kernel_replicant_linux-4f16d4e0c9a4b20d9f0db365587b96d6001efd7d.tar.gz kernel_replicant_linux-4f16d4e0c9a4b20d9f0db365587b96d6001efd7d.tar.bz2 kernel_replicant_linux-4f16d4e0c9a4b20d9f0db365587b96d6001efd7d.zip | |
Merge branch 'perf/core' into perf/urgent
Merge reason: Switch from pre-merge topical split to the post-merge urgent track
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/fcntl.c')
| -rw-r--r-- | fs/fcntl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 5ef953e6f908..97e01dc0d95f 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -199,9 +199,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg) static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, int force) { - unsigned long flags; - - write_lock_irqsave(&filp->f_owner.lock, flags); + write_lock_irq(&filp->f_owner.lock); if (force || !filp->f_owner.pid) { put_pid(filp->f_owner.pid); filp->f_owner.pid = get_pid(pid); @@ -213,7 +211,7 @@ static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, filp->f_owner.euid = cred->euid; } } - write_unlock_irqrestore(&filp->f_owner.lock, flags); + write_unlock_irq(&filp->f_owner.lock); } int __f_setown(struct file *filp, struct pid *pid, enum pid_type type, |