diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 10:33:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 10:33:36 -0700 |
| commit | 096a705bbc080a4041636d07514560da8d78acbe (patch) | |
| tree | 38c3c01225709ffa53419083ea6332f8a72610de /kernel | |
| parent | fea80311a939a746533a6d7e7c3183729d6a3faf (diff) | |
| parent | 5757a6d76cdf6dda2a492c09b985c015e86779b1 (diff) | |
| download | linux-096a705bbc080a4041636d07514560da8d78acbe.tar.gz linux-096a705bbc080a4041636d07514560da8d78acbe.tar.bz2 linux-096a705bbc080a4041636d07514560da8d78acbe.zip | |
Merge branch 'for-3.1/core' of git://git.kernel.dk/linux-block
* 'for-3.1/core' of git://git.kernel.dk/linux-block: (24 commits)
block: strict rq_affinity
backing-dev: use synchronize_rcu_expedited instead of synchronize_rcu
block: fix patch import error in max_discard_sectors check
block: reorder request_queue to remove 64 bit alignment padding
CFQ: add think time check for group
CFQ: add think time check for service tree
CFQ: move think time check variables to a separate struct
fixlet: Remove fs_excl from struct task.
cfq: Remove special treatment for metadata rqs.
block: document blk_plug list access
block: avoid building too big plug list
compat_ioctl: fix make headers_check regression
block: eliminate potential for infinite loop in blkdev_issue_discard
compat_ioctl: fix warning caused by qemu
block: flush MEDIA_CHANGE from drivers on close(2)
blk-throttle: Make total_nr_queued unsigned
block: Add __attribute__((format(printf...) and fix fallout
fs/partitions/check.c: make local symbols static
block:remove some spare spaces in genhd.c
block:fix the comment error in blkdev.h
...
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/exit.c | 1 | ||||
| -rw-r--r-- | kernel/fork.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 73bb192a3d32..12ea415c6435 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -898,7 +898,6 @@ NORET_TYPE void do_exit(long code) profile_task_exit(tsk); - WARN_ON(atomic_read(&tsk->fs_excl)); WARN_ON(blk_needs_flush_plug(tsk)); if (unlikely(in_interrupt())) diff --git a/kernel/fork.c b/kernel/fork.c index aeae5b11b62e..17bf7c8d6511 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -290,7 +290,6 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) /* One for us, one for whoever does the "release_task()" (usually parent) */ atomic_set(&tsk->usage,2); - atomic_set(&tsk->fs_excl, 0); #ifdef CONFIG_BLK_DEV_IO_TRACE tsk->btrace_seq = 0; #endif |