aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-21jfs: replace inode uid,gid,mode init with helperDmitry Monakhov1-10/+2
Acked-by: Dave Kleikamp <[email protected]> Signed-off-by: Dmitry Monakhov <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-219p: replace inode uid,gid,mode initialization with helper functionDmitry Monakhov1-3/+1
Signed-off-by: Dmitry Monakhov <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21vfs: Add inode uid,gid,mode init helperDmitry Monakhov2-1/+22
Signed-off-by: Dmitry Monakhov <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21fs-writeback.c: bitfields should be unsignedH Hartley Sweeten1-3/+3
This fixes sparse noise: error: dubious one-bit signed bitfield Signed-off-by: H Hartley Sweeten <[email protected]> Cc: Alexander Viro <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21namei.c : update mnt when it neededHuang Shijie1-2/+3
update the mnt of the path when it is not equal to the new one. Signed-off-by: Huang Shijie <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21vfs: add lockdep annotation to s_vfs_rename_key for ecryptfsRoland Dreier2-0/+2
> ============================================= > [ INFO: possible recursive locking detected ] > 2.6.31-2-generic #14~rbd3 > --------------------------------------------- > firefox-3.5/4162 is trying to acquire lock: > (&s->s_vfs_rename_mutex){+.+.+.}, at: [<ffffffff81139d31>] lock_rename+0x41/0xf0 > > but task is already holding lock: > (&s->s_vfs_rename_mutex){+.+.+.}, at: [<ffffffff81139d31>] lock_rename+0x41/0xf0 > > other info that might help us debug this: > 3 locks held by firefox-3.5/4162: > #0: (&s->s_vfs_rename_mutex){+.+.+.}, at: [<ffffffff81139d31>] lock_rename+0x41/0xf0 > #1: (&sb->s_type->i_mutex_key#11/1){+.+.+.}, at: [<ffffffff81139d5a>] lock_rename+0x6a/0xf0 > #2: (&sb->s_type->i_mutex_key#11/2){+.+.+.}, at: [<ffffffff81139d6f>] lock_rename+0x7f/0xf0 > > stack backtrace: > Pid: 4162, comm: firefox-3.5 Tainted: G C 2.6.31-2-generic #14~rbd3 > Call Trace: > [<ffffffff8108ae74>] print_deadlock_bug+0xf4/0x100 > [<ffffffff8108ce26>] validate_chain+0x4c6/0x750 > [<ffffffff8108d2e7>] __lock_acquire+0x237/0x430 > [<ffffffff8108d585>] lock_acquire+0xa5/0x150 > [<ffffffff81139d31>] ? lock_rename+0x41/0xf0 > [<ffffffff815526ad>] __mutex_lock_common+0x4d/0x3d0 > [<ffffffff81139d31>] ? lock_rename+0x41/0xf0 > [<ffffffff81139d31>] ? lock_rename+0x41/0xf0 > [<ffffffff8120eaf9>] ? ecryptfs_rename+0x99/0x170 > [<ffffffff81552b36>] mutex_lock_nested+0x46/0x60 > [<ffffffff81139d31>] lock_rename+0x41/0xf0 > [<ffffffff8120eb2a>] ecryptfs_rename+0xca/0x170 > [<ffffffff81139a9e>] vfs_rename_dir+0x13e/0x160 > [<ffffffff8113ac7e>] vfs_rename+0xee/0x290 > [<ffffffff8113c212>] ? __lookup_hash+0x102/0x160 > [<ffffffff8113d512>] sys_renameat+0x252/0x280 > [<ffffffff81133eb4>] ? cp_new_stat+0xe4/0x100 > [<ffffffff8101316a>] ? sysret_check+0x2e/0x69 > [<ffffffff8108c34d>] ? trace_hardirqs_on_caller+0x14d/0x190 > [<ffffffff8113d55b>] sys_rename+0x1b/0x20 > [<ffffffff81013132>] system_call_fastpath+0x16/0x1b The trace above is totally reproducible by doing a cross-directory rename on an ecryptfs directory. The issue seems to be that sys_renameat() does lock_rename() then calls into the filesystem; if the filesystem is ecryptfs, then ecryptfs_rename() again does lock_rename() on the lower filesystem, and lockdep can't tell that the two s_vfs_rename_mutexes are different. It seems an annotation like the following is sufficient to fix this (it does get rid of the lockdep trace in my simple tests); however I would like to make sure I'm not misunderstanding the locking, hence the CC list... Signed-off-by: Roland Dreier <[email protected]> Cc: Tyler Hicks <[email protected]> Cc: Dustin Kirkland <[email protected]> Cc: Al Viro <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21fs/partitions: use ADDPART_FLAG_RAID instead of magic numberCesar Eduardo Barros3-3/+3
ADDPART_FLAG_RAID was introduced in commit d18d768, and most places were converted to use it instead of a hardcoded value. However, some places seem to have been missed. Change all of them to the symbolic names via the following semantic patch: @@ struct parsed_partitions *state; expression E; @@ ( - state->parts[E].flags = 1 + state->parts[E].flags = ADDPART_FLAG_RAID | - state->parts[E].flags |= 1 + state->parts[E].flags |= ADDPART_FLAG_RAID | - state->parts[E].flags = 2 + state->parts[E].flags = ADDPART_FLAG_WHOLEDISK | - state->parts[E].flags |= 2 + state->parts[E].flags |= ADDPART_FLAG_WHOLEDISK ) Signed-off-by: Cesar Eduardo Barros <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21sanitize vfs_fsync calling conventionsChristoph Hellwig11-54/+24
Now that the last user passing a NULL file pointer is gone we can remove the redundant dentry argument and associated hacks inside vfs_fsynmc_range. The next step will be removig the dentry argument from ->fsync, but given the luck with the last round of method prototype changes I'd rather defer this until after the main merge window. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21nfsd: open a file descriptor for fsync in nfs4 recoveryChristoph Hellwig1-45/+42
Instead of just looking up a path use do_filp_open to get us a file structure for the nfs4 recovery directory. This allows us to get rid of the last non-standard vfs_fsync caller with a NULL file pointer. [AV: should be using fput(), not filp_close()] Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21fs: inode.c use atomic_inc_return in __igetRichard Kennedy1-4/+2
Using atomic_inc_return in __iget(struct inode *inode) makes the intent of this code clearer and generates less code on processors that have this operation. On x86_64 this patch reduces the text size of inode.o by 12 bytes. Signed-off-by: Richard Kennedy <[email protected]> ---- patch against 2.6.34-rc7 compiled & tested on x86_64 AMD X2 I've been running with this patch applied for several weeks with no obvious problems. regards Richard Signed-off-by: Al Viro <[email protected]>
2010-05-21anon_inode: set S_IFREG on the anon_inodeEric Paris1-1/+1
anon_inode_mkinode() sets inode->i_mode = S_IRUSR | S_IWUSR; This means that (inode->i_mode & S_IFMT) == 0. This trips up some SELinux code that needs to determine if a given inode is a regular file, a directory, etc. The easiest solution is to just make sure that the anon_inode also sets S_IFREG. Signed-off-by: Eric Paris <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21gfs: constify xattr_handlerStephen Hemminger4-6/+6
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21ocfs: constify xattr_handlerStephen Hemminger3-14/+14
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21jffs2: constify xattr_handlerStephen Hemminger7-15/+15
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21xfs: constify xattr_handlerStephen Hemminger4-9/+9
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21reiserfs: constify xattr_handlerStephen Hemminger7-18/+18
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21ext4: constify xattr_handlerStephen Hemminger6-16/+16
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21ext3: constify xattr handlersStephen Hemminger6-16/+16
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21ext2: constify xattr_handlerStephen Hemminger6-16/+16
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21btrfs: constify xattr_handlerStephen Hemminger3-6/+6
Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21fs: xattr_handler table should be constStephen Hemminger6-15/+15
The entries in xattr handler table should be immutable (ie const) like other operation tables. Later patches convert common filesystems. Uncoverted filesystems will still work, but will generate a compiler warning. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21Introduce freeze_super and thaw_super for the fsfreeze ioctlJosef Bacik4-71/+110
Currently the way we do freezing is by passing sb>s_bdev to freeze_bdev and then letting it do all the work. But freezing is more of an fs thing, and doesn't really have much to do with the bdev at all, all the work gets done with the super. In btrfs we do not populate s_bdev, since we can have multiple bdev's for one fs and setting s_bdev makes removing devices from a pool kind of tricky. This means that freezing a btrfs filesystem fails, which causes us to corrupt with things like tux-on-ice which use the fsfreeze mechanism. So instead of populating sb->s_bdev with a random bdev in our pool, I've broken the actual fs freezing stuff into freeze_super and thaw_super. These just take the super_block that we're freezing and does the appropriate work. It's basically just copy and pasted from freeze_bdev. I've then converted freeze_bdev over to use the new super helpers. I've tested this with ext4 and btrfs and verified everything continues to work the same as before. The only new gotcha is multiple calls to the fsfreeze ioctl will return EBUSY if the fs is already frozen. I thought this was a better solution than adding a freeze counter to the super_block, but if everybody hates this idea I'm open to suggestions. Thanks, Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21Trim includes in fs/super.cAl Viro1-7/+0
Signed-off-by: Al Viro <[email protected]>
2010-05-21Move grabbing s_umount to callers of grab_super()Al Viro2-2/+3
Signed-off-by: Al Viro <[email protected]>
2010-05-21Take statfs variants to fs/statfs.cAl Viro4-192/+197
Signed-off-by: Al Viro <[email protected]>
2010-05-21switch selinux delayed superblock handling to iterate_supers()Al Viro2-48/+8
... kill their private list, while we are at it Signed-off-by: Al Viro <[email protected]>
2010-05-21new helper: iterate_supers()Al Viro6-82/+56
... and switch the simple "loop over superblocks and do something" loops to it. Signed-off-by: Al Viro <[email protected]>
2010-05-21Bury __put_super_and_need_restart()Al Viro5-31/+6
Signed-off-by: Al Viro <[email protected]>
2010-05-21fix prune_dcache()/umount() raceAl Viro1-11/+6
... and get rid of the last __put_super_and_need_restart() caller Signed-off-by: Al Viro <[email protected]>
2010-05-21In get_super() and user_get_super() restarts are unconditionalAl Viro1-8/+10
If superblock had been still alive, we would've returned it... Signed-off-by: Al Viro <[email protected]>
2010-05-21fix get_active_super()/umount() raceAl Viro1-7/+7
This one needs restarts... Signed-off-by: Al Viro <[email protected]>
2010-05-21fix do_emergency_remount()/umount() racesAl Viro1-3/+3
need list_for_each_entry_safe() here. Original didn't even have restart logics, so if you race with umount() it blew up. Signed-off-by: Al Viro <[email protected]>
2010-05-21Convert simple loops over superblocks to list_for_each_entry_safeAl Viro4-20/+11
Signed-off-by: Al Viro <[email protected]>
2010-05-21get rid of restarts in sync_filesystems()Al Viro3-27/+5
At the same time we can kill s_need_restart and local mutex in there. __put_super() made public for a while; will be gone later. Signed-off-by: Al Viro <[email protected]>
2010-05-21Leave superblocks on s_list until the endAl Viro6-4/+25
We used to remove from s_list and s_instances at the same time. So let's *not* do the former and skip superblocks that have empty s_instances in the loops over s_list. The next step, of course, will be to get rid of rescan logics in those loops. Signed-off-by: Al Viro <[email protected]>
2010-05-21Saner locking around deactivate_super()Al Viro2-91/+30
Make sure that s_umount is acquired *before* we drop the final active reference; we still have the fast path (atomic_dec_unless) and we have gotten rid of the window between the moment when s_active hits zero and s_umount is acquired. Which simplifies the living hell out of grab_super() and inotify pin_to_kill() stuff. Signed-off-by: Al Viro <[email protected]>
2010-05-21get rid of S_BIASAl Viro3-37/+24
use atomic_inc_not_zero(&sb->s_active) instead of playing games with checking ->s_count > S_BIAS Signed-off-by: Al Viro <[email protected]>
2010-05-21get rid of open-coded grab_super() in get_active_super()Al Viro1-16/+3
Signed-off-by: Al Viro <[email protected]>
2010-05-21sb_entry() has been killed a couple of years ago and resurrected on mismergeAl Viro1-1/+0
Signed-off-by: Al Viro <[email protected]>
2010-05-21ceph: should use deactivate_locked_super() on failure exitsAl Viro1-2/+1
Signed-off-by: Al Viro <[email protected]>
2010-05-21Clean ecryptfs ->get_sb() upAl Viro1-83/+66
Signed-off-by: Al Viro <[email protected]>
2010-05-21fix a couple of ecryptfs leaksAl Viro2-24/+7
First of all, get_sb_nodev() grabs anon dev minor and we never free it in ecryptfs ->kill_sb(). Moreover, on one of the failure exits in ecryptfs_get_sb() we leak things - it happens before we set ->s_root and ->put_super() won't be called in that case. Solution: kill ->put_super(), do all that stuff in ->kill_sb(). And use kill_anon_sb() instead of generic_shutdown_super() to deal with anon dev leak. Signed-off-by: Al Viro <[email protected]>
2010-05-21Simplify devpts_get_sb() failure exitsAl Viro1-6/+3
postpone simple_set_mnt() until we know we won't fail. Signed-off-by: Al Viro <[email protected]>
2010-05-21remove incorrect comment in do_emergency_remountChristoph Hellwig1-2/+0
Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Al Viro <[email protected]>
2010-05-21clean DCACHE_CANT_MOUNT in d_delete()Al Viro1-0/+1
We set the "it's dead, don't mount on it" flag _and_ do not remove it if we turn the damn thing negative and leave it around. And if it goes positive afterwards, well... Fortunately, there's only one place where that needs to be caught: only d_delete() can turn the sucker negative without immediately freeing it; all other places that can lead to ->d_iput() call are followed by unconditionally freeing struct dentry in question. So the fix is obvious: Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16014 Reported-by: Adam Tkac <[email protected]> Tested-by: Adam Tkac <[email protected]> Cc: <[email protected]> [2.6.34.x] Signed-off-by: Al Viro <[email protected]>
2010-05-21Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds735-51732/+56077
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (577 commits) Staging: ramzswap: Handler for swap slot free callback swap: Add swap slot free callback to block_device_operations swap: Add flag to identify block swap devices Staging: vt6655: use ETH_FRAME_LEN macro instead of custom one Staging: vt6655: use ETH_DATA_LEN macro instead of custom one Staging: vt6655: use ETH_FCS_LEN macro instead of custom one Staging: vt6656: use ETH_HLEN macro instead of custom one Staging: comedi: quatech_daqp_cs.c Replace eos semaphore with a completion. Staging: dt3155v4l: remove private memory allocator Staging: crystalhd: Remove typedefs from driver Staging: winbond: Fix for pointer name format issue in mds.c Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs Staging: vt6656: removed custom CHAR/SHORT/INT/LONG typedefs Staging: comedi: Altered the way printk is used in 8255.c staging: iio: adis16350 and similar IMU driver Staging: iio: max1363 Fix two bugs in single_channel_from_ring Staging: iio: adis16220 extract bin_attribute structures from state Staging: iio: adis16220 vibration sensor driver Staging: comedi: Kconfig dependancy fixes Staging: comedi: fix up build error from last Kconfig changes ...
2010-05-21Merge branch 'for-2.6.35' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds93-1241/+3423
* 'for-2.6.35' of git://git.kernel.dk/linux-2.6-block: (86 commits) pipe: set lower and upper limit on max pages in the pipe page array pipe: add support for shrinking and growing pipes drbd: This is now equivalent to drbd release 8.3.8rc1 drbd: Do not free p_uuid early, this is done in the exit code of the receiver drbd: Null pointer deref fix to the large "multi bio rewrite" drbd: Fix: Do not detach, if a bio with a barrier fails drbd: Ensure to not trigger late-new-UUID creation multiple times drbd: Do not Oops when C_STANDALONE when uuid gets generated writeback: fix mixed up arguments to bdi_start_writeback() writeback: fix problem with !CONFIG_BLOCK compilation block: improve automatic native capacity unlocking block: use struct parsed_partitions *state universally in partition check code block,ide: simplify bdops->set_capacity() to ->unlock_native_capacity() block: restart partition scan after resizing a device buffer: make invalidate_bdev() drain all percpu LRU add caches block: remove all rcu head initializations writeback: fixups for !dirty_writeback_centisecs writeback: bdi_writeback_task() must set task state before calling schedule() writeback: ensure that WB_SYNC_NONE writeback with sb pinned is sync drivers/block/drbd: Use kzalloc ...
2010-05-21Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds38-3789/+3355
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (25 commits) MIPS: Use GCC __builtin_prefetch() to implement prefetch(). MIPS: Octeon: Serial port fixes for OCTEON simulator. MIPS: Octeon: Get rid of early serial. MIPS: AR7: prevent race between clock initialization and devices registration MIPS: AR7: use ar7_has_high_vlynq() to determine watchdog base address MIPS: BCM63xx: Avoid namespace clash on GPIO_DIR_{IN,OUT} MIPS: MTX-1: Update defconfig MIPS: BCM47xx: Update defconfig MIPS: RB532: Update defconfig MIPS: AR7: Update defconfig RTC: rtc-cmos: Fix binary mode support MIPS: Oprofile: Loongson: Cleanup the comments MIPS: Oprofile: Loongson: Cleanup of the macros MIPS: Oprofile: Loongson: Remove unused variable from loongson2_cpu_setup() MIPS: Oprofile: Loongson: Remove useless parentheses MIPS: Oprofile: Loongson: Unify macro for setting events MIPS: nofpu and nodsp only affect CPU0 MIPS: Clean up tables for bootmem allocation MIPS: Coding style cleanups of access of FCSR rounding mode bits MIPS: Loongson 2F: Add gpio/gpioilb support ...
2010-05-21sysctl: fix kernel-doc notation and typosRandy Dunlap1-19/+19
Fix kernel-doc warnings, kernel-doc special characters, and typos in recent kernel/sysctl.c additions. Signed-off-by: Randy Dunlap <[email protected]> Cc: Amerigo Wang <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-21Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds24-129/+1573
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (23 commits) OMAP: DSS2: Fix omap_dss_probe() error path OMAP: DSS2: omap_dss_probe() conditional compilation cleanup board-omap3-beagle: add DSS2 support OMAP2: DSS: Add missing line for update bg color OMAP3630: DSS2: Updating MAX divider value OMAP: RX51: Update board defconfig OMAP: DSS2: Add ACX565AKM Panel Driver OMAP: RX51: Add Touch Controller in SPI board info OMAP: RX51: Add LCD Panel support OMAP: DSS2: TPO-TD03MTEA1: fix Kconfig dependency OMAP: LCD LS037V7DW01: Add Backlight driver support OMAP: DSS2: Taal: Fix DSI bus locking problem OMAP: DSS2: Taal: add mutex to protect panel data OMAP: DSS2: Make partial update width even OMAP: DSS2: Fix device disable when driver is not loaded OMAP: DSS2: VENC: don't call platform_enable/disable() twice OMAP: DSS2: check lock_fb_info() return value OMAP: DSS2: fix lock_fb_info() and omapfb_lock() locking order OMAP: DSS2: Use vdds_sdi regulator supply in SDI OMAP: DSS2: Remove redundant enable/disable calls from SDI ...
Powered by cgit, Gruvboxed by Blaster4385.