minor whitespace fixups for ya on top of that patch:
Index: linux-2.6.30.1/fs/xfs/linux-2.6/xfs_buf.h
===================================================================
--- linux-2.6.30.1.orig/fs/xfs/linux-2.6/xfs_buf.h
+++ linux-2.6.30.1/fs/xfs/linux-2.6/xfs_buf.h
@@ -104,7 +104,7 @@ typedef enum {
{ XBF_DELWRI, "DELWRI" }, \
{ XBF_STALE, "STALE" }, \
{ XBF_FS_MANAGED, "FS_MANAGED" }, \
- { XBF_ORDERED, "ORDERED" }, \
+ { XBF_ORDERED, "ORDERED" }, \
{ XBF_READ_AHEAD, "READ_AHEAD" }, \
{ XBF_LOCK, "LOCK" }, /* should never be set */\
{ XBF_TRYLOCK, "TRYLOCK" }, /* ditto */\
Index: linux-2.6.30.1/fs/xfs/linux-2.6/xfs_lrw.c
===================================================================
--- linux-2.6.30.1.orig/fs/xfs/linux-2.6/xfs_lrw.c
+++ linux-2.6.30.1/fs/xfs/linux-2.6/xfs_lrw.c
@@ -667,7 +667,7 @@ start:
need_i_mutex = 0;
}
- trace_xfs_rw(xip, count, *offset, ioflags, "write");
+ trace_xfs_rw(xip, count, *offset, ioflags, "write");
ret = generic_file_direct_write(iocb, iovp,
&segs, pos, offset, count, ocount);
Index: linux-2.6.30.1/fs/xfs/linux-2.6/xfs_trace.h
===================================================================
--- linux-2.6.30.1.orig/fs/xfs/linux-2.6/xfs_trace.h
+++ linux-2.6.30.1/fs/xfs/linux-2.6/xfs_trace.h
@@ -107,7 +107,7 @@ TRACE_EVENT(xfs_attr_list,
__entry->count,
__entry->firstu,
__entry->flags,
- __print_flags(__entry->flags, "|", XFS_ATTR_FLAGS)
+ __print_flags(__entry->flags, "|", XFS_ATTR_FLAGS)
/* we currently miss out on the per-type a13/14/15 here */
)
);
@@ -219,7 +219,7 @@ TRACE_EVENT(xfs_buf,
__entry->hold,
__entry->lockval,
__entry->val,
- (unsigned long long)__entry->file_offset,
+ (unsigned long long)__entry->file_offset,
__entry->buffer_length,
__print_flags(__entry->flags, "|", XFS_BUF_FLAGS),
(void *)__entry->caller_ip)
@@ -891,8 +891,8 @@ TRACE_EVENT(xfs_free_extent,
__entry->len,
__entry->isfl,
__entry->haveleft ?
- (__entry->haveright ? "both" : "left") :
- (__entry->haveright ? "right" : "none"))
+ (__entry->haveright ? "both" : "left") :
+ (__entry->haveright ? "right" : "none"))
);
Index: linux-2.6.30.1/fs/xfs/xfs_trans.h
===================================================================
--- linux-2.6.30.1.orig/fs/xfs/xfs_trans.h
+++ linux-2.6.30.1/fs/xfs/xfs_trans.h
@@ -138,11 +138,11 @@ typedef struct xfs_trans_header {
{ XFS_TRANS_GROWFSRT_ALLOC, "GROWFSRT_ALLOC" }, \
{ XFS_TRANS_GROWFSRT_ZERO, "GROWFSRT_ZERO" }, \
{ XFS_TRANS_GROWFSRT_FREE, "GROWFSRT_FREE" }, \
- { XFS_TRANS_SWAPEXT, "SWAPEXT" }, \
+ { XFS_TRANS_SWAPEXT, "SWAPEXT" }, \
{ XFS_TRANS_SB_COUNT, "SB_COUNT" }, \
- { XFS_TRANS_DUMMY1, "DUMMY1" }, \
- { XFS_TRANS_DUMMY2, "DUMMY2" }, \
- { XLOG_UNMOUNT_REC_TYPE, "UNMOUNT" }
+ { XFS_TRANS_DUMMY1, "DUMMY1" }, \
+ { XFS_TRANS_DUMMY2, "DUMMY2" }, \
+ { XLOG_UNMOUNT_REC_TYPE, "UNMOUNT" }
/*
* This structure is used to track log items associated with
|