Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 243007
b: refs/heads/master
c: 614a9e8
h: refs/heads/master
i:
  243005: 07feae4
  243003: 7fc28a5
  242999: 060cefc
  242991: 658d59c
  242975: f0af1cb
  242943: 692b4e3
v: v3
  • Loading branch information
Tao Ma committed Feb 22, 2011
1 parent 859a821 commit 56a5c6d
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9558156bcf8e4750d20034e941213273743ed86a
refs/heads/master: 614a9e849ca6ea24843795251cb30af525d5336b
1 change: 0 additions & 1 deletion trunk/fs/ocfs2/cluster/masklog.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = {
define_mask(AIO),
define_mask(JOURNAL),
define_mask(SUPER),
define_mask(FILE_IO),
define_mask(EXTENT_MAP),
define_mask(DLM_GLUE),
define_mask(BH_IO),
Expand Down
1 change: 0 additions & 1 deletion trunk/fs/ocfs2/cluster/masklog.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@
#define ML_AIO 0x0000000000002000ULL /* ocfs2 aio read and write */
#define ML_JOURNAL 0x0000000000004000ULL /* ocfs2 journalling functions */
#define ML_SUPER 0x0000000000010000ULL /* ocfs2 mount / umount */
#define ML_FILE_IO 0x0000000000020000ULL /* ocfs2 file I/O */
#define ML_EXTENT_MAP 0x0000000000040000ULL /* ocfs2 extent map caching */
#define ML_DLM_GLUE 0x0000000000080000ULL /* ocfs2 dlm glue layer */
#define ML_BH_IO 0x0000000000100000ULL /* ocfs2 buffer I/O */
Expand Down
7 changes: 3 additions & 4 deletions trunk/fs/ocfs2/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <linux/signal.h>
#include <linux/rbtree.h>

#define MLOG_MASK_PREFIX ML_FILE_IO
#include <cluster/masklog.h>

#include "ocfs2.h"
Expand All @@ -42,20 +41,20 @@
#include "inode.h"
#include "mmap.h"
#include "super.h"
#include "ocfs2_trace.h"


static int ocfs2_fault(struct vm_area_struct *area, struct vm_fault *vmf)
{
sigset_t oldset;
int ret;

mlog(0, "(area=%p, page offset=%lu)\n", area, vmf->pgoff);

ocfs2_block_signals(&oldset);
ret = filemap_fault(area, vmf);
ocfs2_unblock_signals(&oldset);

mlog(0, "%p\n", vmf->page);
trace_ocfs2_fault(OCFS2_I(area->vm_file->f_mapping->host)->ip_blkno,
area, vmf->page, vmf->pgoff);
return ret;
}

Expand Down
25 changes: 25 additions & 0 deletions trunk/fs/ocfs2/ocfs2_trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,31 @@ TRACE_EVENT(ocfs2_write_end_inline,
);

/* End of trace events for fs/ocfs2/aops.c. */

/* Trace events for fs/ocfs2/mmap.c. */

TRACE_EVENT(ocfs2_fault,
TP_PROTO(unsigned long long ino,
void *area, void *page, unsigned long pgoff),
TP_ARGS(ino, area, page, pgoff),
TP_STRUCT__entry(
__field(unsigned long long, ino)
__field(void *, area)
__field(void *, page)
__field(unsigned long, pgoff)
),
TP_fast_assign(
__entry->ino = ino;
__entry->area = area;
__entry->page = page;
__entry->pgoff = pgoff;
),
TP_printk("%llu %p %p %lu",
__entry->ino, __entry->area, __entry->page, __entry->pgoff)
);

/* End of trace events for fs/ocfs2/mmap.c. */

#endif /* _TRACE_OCFS2_H */

/* This part must be outside protection */
Expand Down

0 comments on commit 56a5c6d

Please sign in to comment.