aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/keystore.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-16 16:19:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-16 16:19:54 -0800
commitdfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8 (patch)
tree80a0af3d940ca160dff0fc338ce6777a5b7058e1 /fs/ecryptfs/keystore.c
parentMerge tag 'pm+acpi-for-3.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff)
parentxfs: recalculate leaf entry pointer after compacting a dir2 block (diff)
downloadlinux-dev-dfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8.tar.xz
linux-dev-dfdebc24837ed0a1d6ad73b108a10d3c88d1b6e8.zip
Merge tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs
Pull xfs bugfixes from Ben Myers: - fix(es) for compound buffers - fix for dquot soft timer asserts due to overflow of d_blk_softlimit - fix for regression in dir v2 code introduced in commit 20f7e9f3726a ("xfs: factor dir2 block read operations") * tag 'for-linus-v3.8-rc4' of git://oss.sgi.com/xfs/xfs: xfs: recalculate leaf entry pointer after compacting a dir2 block xfs: remove int casts from debug dquot soft limit timer asserts xfs: fix the multi-segment log buffer format xfs: fix segment in xfs_buf_item_format_segment xfs: rename bli_format to avoid confusion with bli_formats xfs: use b_maps[] for discontiguous buffers
Diffstat (limited to 'fs/ecryptfs/keystore.c')
0 files changed, 0 insertions, 0 deletions