summaryrefslogtreecommitdiff
ModeNameSize
-rw-r--r--.bashrc2576logplain
d---------.zsh645logplain
-rw-r--r--.zshenv374logplain
-rw-r--r--.zshrc370logplain
noscript>
authorTao Ma <boyu.mt@taobao.com>2011-05-23 10:36:45 +0800
committerJoel Becker <jlbec@evilplan.org>2011-05-23 23:37:20 -0700
commit10fca35ff12ad2a7017bce6567cffe9da443d7a2 (patch)
tree46c8fd9157bde0616798ff1945d16da4c9881d16 /fs/ocfs2/alloc.c
parent55e67872b67ebd30d1326067cdba53a622ab497d (diff)
ocfs2: Add trace event for trim.
Add the corresponding trace event for trim. Signed-off-by: Tao Ma <boyu.mt@taobao.com> Signed-off-by: Joel Becker <jlbec@evilplan.org>
Diffstat (limited to 'fs/ocfs2/alloc.c')
s='commit-subject'>Merge branch 'next' into upstream-merge
Conflicts: fs/ext4/inode.c fs/ext4/mballoc.c include/trace/events/ext4.h
Diffstat (limited to 'fs/jbd2/checkpoint.c')