aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-03-05x86: fix mtrr missing kernel-docRandy Dunlap1-0/+1
Fix missing kernel-doc notation in mtrr/main.c: Warning(arch/x86/kernel/cpu/mtrr/main.c:152): No description found for parameter 'info' Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-03-05Merge branch 'perf-probes-for-linus-2' of ↵Linus Torvalds18-835/+2063
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-probes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Issue at least one memory barrier in stop_machine_text_poke() perf probe: Correct probe syntax on command line help perf probe: Add lazy line matching support perf probe: Show more lines after last line perf probe: Check function address range strictly in line finder perf probe: Use libdw callback routines perf probe: Use elfutils-libdw for analyzing debuginfo perf probe: Rename probe finder functions perf probe: Fix bugs in line range finder perf probe: Update perf probe document perf probe: Do not show --line option without dwarf support kprobes: Add documents of jump optimization kprobes/x86: Support kprobes jump optimization on x86 x86: Add text_poke_smp for SMP cross modifying code kprobes/x86: Cleanup save/restore registers kprobes/x86: Boost probes when reentering kprobes: Jump optimization sysctl interface kprobes: Introduce kprobes jump optimization kprobes: Introduce generic insn_slot framework kprobes/x86: Cleanup RELATIVEJUMP_INSTRUCTION to RELATIVEJUMP_OPCODE
2010-03-05Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds4-14/+23
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: padata: Allocate the cpumask for the padata instance crypto: authenc - Move saved IV in front of the ablkcipher request crypto: hash - Fix handling of unaligned buffers crypto: authenc - Use correct ahash complete functions crypto: md5 - Set statesize
2010-03-05Merge branch 'for_linus' of ↵Linus Torvalds27-657/+1344
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (36 commits) ext4: fix up rb_root initializations to use RB_ROOT ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl ext4: Fix the NULL reference in double_down_write_data_sem() ext4: Fix insertion point of extent in mext_insert_across_blocks() ext4: consolidate in_range() definitions ext4: cleanup to use ext4_grp_offs_to_block() ext4: cleanup to use ext4_group_first_block_no() ext4: Release page references acquired in ext4_da_block_invalidatepages ext4: Fix ext4_quota_write cross block boundary behaviour ext4: Convert BUG_ON checks to use ext4_error() instead ext4: Use direct_IO_no_locking in ext4 dio read ext4: use ext4_get_block_write in buffer write ext4: mechanical rename some of the direct I/O get_block's identifiers ext4: make "offset" consistent in ext4_check_dir_entry() ext4: Handle non empty on-disk orphan link ext4: explicitly remove inode from orphan list after failed direct io ext4: fix error handling in migrate ext4: deprecate obsoleted mount options ext4: Fix fencepost error in chosing choosing group vs file preallocation. jbd2: clean up an assertion in jbd2_journal_commit_transaction() ...
2010-03-05Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linusLinus Torvalds18-128/+335
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: Squashfs: get rid of obsolete definition in header file Squashfs: get rid of obsolete variable in struct squashfs_sb_info Squashfs: add decompressor entries for lzma and lzo Squashfs: add a decompressor framework Squashfs: factor out remaining zlib dependencies into separate wrapper file Squashfs: move zlib decompression wrapper code into a separate file
2010-03-05pass writeback_control to ->write_inodeChristoph Hellwig45-72/+115
This gives the filesystem more information about the writeback that is happening. Trond requested this for the NFS unstable write handling, and other filesystems might benefit from this too by beeing able to distinguish between the different callers in more detail. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-03-05make sure data is on disk before calling ->write_inodeChristoph Hellwig6-38/+11
Similar to the fsync issue fixed a while ago in commit 2daea67e966dc0c42067ebea015ddac6834cef88 we need to write for data to actually hit the disk before writing out the metadata to guarantee data integrity for filesystems that modify the inode in the data I/O completion path. Currently XFS and NFS handle this manually, and AFS has a write_inode method that does nothing but waiting for data, while others are possibly missing out on this. Fortunately this change has a lot less impact than the fsync change as none of the write_inode methods starts data writeout of any form by itself. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-03-05Merge branch 'for-2.6.34-rc1-batch2' into for-linusAlex Elder26-1484/+1344
2010-03-05xfs: return inode fork offset in bulkstat for fsrDave Chinner2-1/+4
So that fsr can attempt to get the fork offset of the temporary inode it uses the same as the inode it is defragmenting, pass the fork offset out in the bulkstat information. The bulkstat structure has padding that has always been zeroed, so userspace can tell if this field is set or not by use of the xattr present flag and a non-zero value for the fork offset. Signed-off-by: Dave Chinner <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Alex Elder <[email protected]>
2010-03-05xfs: Increase the default size of the reserved blocks poolDave Chinner1-20/+29
The current default size of the reserved blocks pool is easy to deplete with certain workloads, in particular workloads that do lots of concurrent delayed allocation extent conversions. If enough transactions are running in parallel and the entire pool is consumed then subsequent calls to xfs_trans_reserve() will fail with ENOSPC. Also add a rate limited warning so we know if this starts happening again. This is an updated version of an old patch from Lachlan McIlroy. Signed-off-by: Dave Chinner <[email protected]> Signed-off-by: Alex Elder <[email protected]>
2010-03-05xfs: truncate delalloc extents when IO fails in writebackDave Chinner1-10/+114
We currently use block_invalidatepage() to clean up pages where I/O fails in ->writepage(). Unfortunately, if the page has delalloc regions on it, we fail to remove the delalloc regions when we invalidate the page. This can result in tripping a BUG() in xfs_get_blocks() later on if a direct IO read is done on that same region - the delalloc extent is returned when none is supposed to be there. Fix this by truncating away the delalloc regions on the page before invalidating it. Because they are delalloc, we can do this without needing a transaction. Indeed - if we get ENOSPC errors, we have to be able to do this truncation without a transaction as there is no space left for block reservation (typically why we see a ENOSPC in writeback). Signed-off-by: Dave Chinner <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Alex Elder <[email protected]>
2010-03-05xfs: check for more work before sleeping in xfssyncdDave Chinner1-3/+3
xfssyncd processes a queue of work by detaching the queue and then iterating over all the work items. It then sleeps for a time period or until new work comes in. If new work is queued while xfssyncd is actively processing the detached work queue, it will not process that new work until after a sleep timeout or the next work event queued wakes it. Fix this by checking the work queue again before going to sleep. Signed-off-by: Dave Chinner <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Alex Elder <[email protected]>
2010-03-05xfs: Fix a build warning in xfs_aops.cDave Chinner1-1/+1
Fix a build warning that slipped through. Dave Chinner had posted an updated version of his patch but the previous version--without this fix--was what got committed. Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Dave Chinner <[email protected]> Signed-off-by: Alex Elder <[email protected]>
2010-03-05ALSA: hda: uninitialized variable fixFrederik Deweerdt1-1/+1
Commit eaa9b3a748539651f50e3a234c8854e1b42a839a introduced the following uninitialized warning: sound/pci/hda/patch_realtek.c: In function 'set_capture_mixer': sound/pci/hda/patch_realtek.c:4928: warning: 'pin' is used uninitialized in this function sound/pci/hda/patch_realtek.c:4918: note: 'pin' was declared here It appears indeed that 'pin' needs to be initialized to 0. Signed-off-by: Frederik Deweerdt <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-03-05Squashfs: get rid of obsolete definition in header filePhillip Lougher1-2/+0
Signed-off-by: Phillip Lougher <[email protected]>
2010-03-05Squashfs: get rid of obsolete variable in struct squashfs_sb_infoPhillip Lougher1-1/+0
Signed-off-by: Phillip Lougher <[email protected]>
2010-03-05[LogFS] Check feature flagsJoern Engel2-2/+12
2010-03-05ALSA: hda: Use LPIB for a Biostar Microtech boardDaniel T Chen1-0/+1
BugLink: https://launchpad.net/bugs/523953 The OR has verified that position_fix=1 is necessary to work around errors on his machine. Reported-by: MMarking Cc: <[email protected]> Signed-off-by: Daniel T Chen <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-03-05Switch !O_CREAT case to use of do_last()Al Viro1-61/+66
... and now we have all intents crap well localized Signed-off-by: Al Viro <[email protected]>
2010-03-05Get rid of symlink body copyingAl Viro1-31/+24
Now that nd->last stays around until ->put_link() is called, we can just postpone that ->put_link() in do_filp_open() a bit and don't bother with copying. Signed-off-by: Al Viro <[email protected]>
2010-03-05Finish pulling of -ESTALE handling to upper level in do_filp_open()Al Viro1-1/+3
Don't bother with path_walk() (and its retry loop); link_path_walk() will do it. Signed-off-by: Al Viro <[email protected]>
2010-03-05Turn do_link spaghetty into a normal loopAl Viro1-45/+38
Signed-off-by: Al Viro <[email protected]>
2010-03-05Unify exits in O_CREAT handlingAl Viro1-17/+13
Signed-off-by: Al Viro <[email protected]>
2010-03-05Kill is_link argument of do_last()Al Viro1-14/+7
We set it to 1 iff we return NULL Signed-off-by: Al Viro <[email protected]>
2010-03-05Pull handling of LAST_BIND into do_last(), clean up ok: part in do_filp_open()Al Viro1-11/+6
Note that in case of !O_CREAT we know that nd.root has already been given up Signed-off-by: Al Viro <[email protected]>
2010-03-05Leave mangled flag only for setting nd.intent.open.flagAl Viro1-6/+6
Nothing else uses it anymore Signed-off-by: Al Viro <[email protected]>
2010-03-05Get rid of passing mangled flag to do_last()Al Viro1-5/+5
Signed-off-by: Al Viro <[email protected]>
2010-03-05Don't pass mangled open_flag to finish_open()Al Viro1-4/+4
Signed-off-by: Al Viro <[email protected]>
2010-03-05pull more into do_last()Al Viro1-14/+7
Handling of LAST_DOT/LAST_ROOT/LAST_DOTDOT/terminating slash can be pulled in as well Signed-off-by: Al Viro <[email protected]>
2010-03-05bail out with ELOOP earlier in do_link loopAl Viro1-6/+1
If we'd passed through 32 trailing symlinks already, there's no sense following the 33rd - we'll bail out anyway. Better bugger off earlier. It *does* change behaviour, after a fashion - if the 33rd happens to be a procfs-style symlink, original code *would* allow it. This one will not. Cry me a river if that hurts you. Please, do. And post a video of that, while you are at it. Signed-off-by: Al Viro <[email protected]>
2010-03-05pull the common predecessors into do_last()Al Viro1-12/+9
Signed-off-by: Al Viro <[email protected]>
2010-03-05postpone __putname() until after do_last()Al Viro1-1/+1
Since do_last() doesn't mangle nd->last_name, we can safely postpone __putname() done in handling of trailing symlinks until after the call of do_last() Signed-off-by: Al Viro <[email protected]>
2010-03-05unroll do_last: loop in do_filp_open()Al Viro1-3/+7
Signed-off-by: Al Viro <[email protected]>
2010-03-05Shift releasing nd->root from do_last() to its callerAl Viro1-6/+2
Signed-off-by: Al Viro <[email protected]>
2010-03-05gut do_filp_open() a bit more (do_last separation)Al Viro1-68/+103
Brute-force separation of stuff reachable from do_last: with the exception of do_link:; just take all that crap to a helper function as-is and have it tell the caller if it has to go to do_link. Signed-off-by: Al Viro <[email protected]>
2010-03-05beginning to untangle do_filp_open()Al Viro1-50/+56
That's going to be a long and painful series. The first step: take the stuff reachable from 'ok' label in do_filp_open() into a new helper (finish_open()). Signed-off-by: Al Viro <[email protected]>
2010-03-05Input: wacom - merge out and in prox eventsPing Cheng1-104/+59
Process out and in prox events for Graphire and Tablet PC devices in the same loop to simplify the data parsing logic. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-03-05Input: gamecon - fix off by one range checkDan Carpenter1-1/+1
It should be >= GC_MAX not > GC_MAX. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-03-05ALSA: usb/audio.h: Fix field orderDaniel Mack1-1/+1
Signed-off-by: Daniel Mack <[email protected]> Cc: Clemens Ladisch <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-03-05ALSA: fix jazz16 compile (udelay)Meelis Roos1-0/+1
While trying to compile jazz16 isa sound driver on alpha (2.6.33+git), I found a compile failure in jazz16.c (udelay is unknown). Fix it by including delay.h. Signed-foo-by: Meelis Roos <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-03-04ext4: fix up rb_root initializations to use RB_ROOTVenkatesh Pallipadi3-4/+4
ext4 uses rb_node = NULL; to zero rb_root at few places. Using RB_ROOT as the initializer is more portable in case the underlying implementation of rbtrees changes in the future. Signed-off-by: Venkatesh Pallipadi <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]> Cc: Eric Paris <[email protected]>
2010-03-05quota: stop using QUOTA_OK / NO_QUOTAChristoph Hellwig2-27/+24
Just use 0 / -EDQUOT directly - that's what it translates to anyway. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-05dquot: cleanup dquot initialize routineChristoph Hellwig39-145/+141
Get rid of the initialize dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_initialize helper to __dquot_initialize and vfs_dq_init to dquot_initialize to have a consistent namespace. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-05dquot: move dquot initialization responsibility into the filesystemChristoph Hellwig32-56/+220
Currently various places in the VFS call vfs_dq_init directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the initialization. For most metadata operations this is a straight forward move into the methods, but for truncate and open it's a bit more complicated. For truncate we currently only call vfs_dq_init for the sys_truncate case because open already takes care of it for ftruncate and open(O_TRUNC) - the new code causes an additional vfs_dq_init for those which is harmless. For open the initialization is moved from do_filp_open into the open method, which means it happens slightly earlier now, and only for regular files. The latter is fine because we don't need to initialize it for operations on special files, and we already do it as part of the namespace operations for directories. Add a dquot_file_open helper that filesystems that support generic quotas can use to fill in ->open. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-05dquot: cleanup dquot drop routineChristoph Hellwig22-59/+49
Get rid of the drop dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_drop helper to __dquot_drop and vfs_dq_drop to dquot_drop to have a consistent namespace. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-05dquot: move dquot drop responsibility into the filesystemChristoph Hellwig9-1/+27
Currently clear_inode calls vfs_dq_drop directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the drop inside the ->clear_inode superblock operation. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-05dquot: cleanup dquot transfer routineChristoph Hellwig17-29/+19
Get rid of the transfer dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_transfer helper to __dquot_transfer and vfs_dq_transfer to dquot_transfer to have a consistent namespace, and make the new dquot_transfer return a normal negative errno value which all callers expect. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-05dquot: move dquot transfer responsibility into the filesystemChristoph Hellwig8-38/+65
Currently notify_change calls vfs_dq_transfer directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the transfer. Most filesystems already do this, only ufs and udf need the code added, and for jfs it needs to be enabled unconditionally instead of only when ACLs are enabled. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-05dquot: cleanup inode allocation / freeing routinesChristoph Hellwig18-107/+61
Get rid of the alloc_inode and free_inode dquot operations - they are always called from the filesystem and if a filesystem really needs their own (which none currently does) it can just call into it's own routine directly. Also get rid of the vfs_dq_alloc/vfs_dq_free wrappers and always call the lowlevel dquot_alloc_inode / dqout_free_inode routines directly, which now lose the number argument which is always 1. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2010-03-05dquot: cleanup space allocation / freeing routinesChristoph Hellwig29-383/+258
Get rid of the alloc_space, free_space, reserve_space, claim_space and release_rsv dquot operations - they are always called from the filesystem and if a filesystem really needs their own (which none currently does) it can just call into it's own routine directly. Move shared logic into the common __dquot_alloc_space, dquot_claim_space_nodirty and __dquot_free_space low-level methods, and rationalize the wrappers around it to move as much as possible code into the common block for CONFIG_QUOTA vs not. Also rename all these helpers to be named dquot_* instead of vfs_dq_*. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Jan Kara <[email protected]>