diff for duplicates of <473D3577.5080409@sgi.com> diff --git a/a/1.txt b/N1/1.txt index adf2c86..c913d53 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -64,8 +64,10 @@ Timothy Shimmin wrote: > b/fs/xfs/xfs_vnodeops.c | 9 +++------ > 7 files changed, 17 insertions(+), 47 deletions(-) > -> =====================================> Index: fs/xfs/linux-2.6/xfs_linux.h -> =====================================> +> =========================================================================== +> Index: fs/xfs/linux-2.6/xfs_linux.h +> =========================================================================== +> > --- a/fs/xfs/linux-2.6/xfs_linux.h 2007-11-16 16:22:40.000000000 +1100 > +++ b/fs/xfs/linux-2.6/xfs_linux.h 2007-11-16 15:59:22.299466117 +1100 > @@ -143,43 +143,17 @@ @@ -114,8 +116,10 @@ Timothy Shimmin wrote: > #define EWRONGFS EINVAL /* Mount with wrong filesystem type */ > #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ > -> =====================================> Index: fs/xfs/linux-2.6/xfs_lrw.c -> =====================================> +> =========================================================================== +> Index: fs/xfs/linux-2.6/xfs_lrw.c +> =========================================================================== +> > --- a/fs/xfs/linux-2.6/xfs_lrw.c 2007-11-16 16:22:40.000000000 +1100 > +++ b/fs/xfs/linux-2.6/xfs_lrw.c 2007-11-15 11:32:12.451249159 +1100 > @@ -254,9 +254,8 @@ xfs_read( @@ -132,7 +136,7 @@ Timothy Shimmin wrote: > xfs_iunlock(ip, XFS_IOLOCK_SHARED); > @@ -742,9 +741,9 @@ retry: > if (VN_CACHED(vp)) { -> WARN_ON(need_i_mutex = 0); +> WARN_ON(need_i_mutex == 0); > xfs_inval_cached_trace(xip, pos, -1, > - ctooff(offtoct(pos)), -1); > + (pos & PAGE_CACHE_MASK), -1); @@ -143,8 +147,10 @@ Timothy Shimmin wrote: > if (error) > goto out_unlock_internal; > -> =====================================> Index: fs/xfs/quota/xfs_qm.h -> =====================================> +> =========================================================================== +> Index: fs/xfs/quota/xfs_qm.h +> =========================================================================== +> > --- a/fs/xfs/quota/xfs_qm.h 2007-11-16 16:22:40.000000000 +1100 > +++ b/fs/xfs/quota/xfs_qm.h 2007-11-16 15:39:53.373375739 +1100 > @@ -52,8 +52,8 @@ extern kmem_zone_t *qm_dqtrxzone; @@ -159,8 +165,10 @@ Timothy Shimmin wrote: > /* > * This defines the unit of allocation of dquots. > -> =====================================> Index: fs/xfs/xfs_bmap.c -> =====================================> +> =========================================================================== +> Index: fs/xfs/xfs_bmap.c +> =========================================================================== +> > --- a/fs/xfs/xfs_bmap.c 2007-11-16 16:22:41.000000000 +1100 > +++ b/fs/xfs/xfs_bmap.c 2007-11-16 15:40:27.017050666 +1100 > @@ -2830,11 +2830,11 @@ xfs_bmap_btalloc( @@ -178,8 +186,10 @@ Timothy Shimmin wrote: > args.mod = (xfs_extlen_t)(args.prod - args.mod); > } > -> =====================================> Index: fs/xfs/xfs_itable.c -> =====================================> +> =========================================================================== +> Index: fs/xfs/xfs_itable.c +> =========================================================================== +> > --- a/fs/xfs/xfs_itable.c 2007-11-16 16:22:40.000000000 +1100 > +++ b/fs/xfs/xfs_itable.c 2007-11-16 16:05:51.381600461 +1100 > @@ -393,7 +393,7 @@ xfs_bulkstat( @@ -201,8 +211,10 @@ Timothy Shimmin wrote: > error = bufidx = 0; > cur = NULL; > -> =====================================> Index: fs/xfs/xfs_log.c -> =====================================> +> =========================================================================== +> Index: fs/xfs/xfs_log.c +> =========================================================================== +> > --- a/fs/xfs/xfs_log.c 2007-11-16 16:22:40.000000000 +1100 > +++ b/fs/xfs/xfs_log.c 2007-11-16 15:56:42.615917720 +1100 > @@ -1552,7 +1552,7 @@ xlog_dealloc_log(xlog_t *log) @@ -231,8 +243,10 @@ Timothy Shimmin wrote: > spin_lock(&log->l_icloglock); > > -> =====================================> Index: fs/xfs/xfs_vnodeops.c -> =====================================> +> =========================================================================== +> Index: fs/xfs/xfs_vnodeops.c +> =========================================================================== +> > --- a/fs/xfs/xfs_vnodeops.c 2007-11-16 16:22:41.000000000 +1100 > +++ b/fs/xfs/xfs_vnodeops.c 2007-11-16 15:57:01.449505791 +1100 > @@ -4164,15 +4164,12 @@ xfs_free_file_space( diff --git a/a/content_digest b/N1/content_digest index 48fef89..42eee32 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,8 +11,8 @@ "ref\020071115062728.GH66820511@sgi.com\0" "ref\0473D2BFB.6040702@sgi.com\0" "From\0Lachlan McIlroy <lachlan@sgi.com>\0" - "Subject\0Re: [xfs-masters] [PATCH] remove BPCSHIFT and NB?P? macros - was\0" - "Date\0Fri, 16 Nov 2007 06:15:19 +0000\0" + "Subject\0Re: [xfs-masters] [PATCH] remove BPCSHIFT and NB?P? macros - was fs/xfs: remove duplicated defines\0" + "Date\0Fri, 16 Nov 2007 17:15:19 +1100\0" "To\0xfs-masters@oss.sgi.com\0" "Cc\0Eric Sandeen <sandeen@sandeen.net>" xfs@oss.sgi.com @@ -85,8 +85,10 @@ "> b/fs/xfs/xfs_vnodeops.c | 9 +++------\n" "> 7 files changed, 17 insertions(+), 47 deletions(-)\n" "> \n" - "> =====================================> Index: fs/xfs/linux-2.6/xfs_linux.h\n" - "> =====================================> \n" + "> ===========================================================================\n" + "> Index: fs/xfs/linux-2.6/xfs_linux.h\n" + "> ===========================================================================\n" + "> \n" "> --- a/fs/xfs/linux-2.6/xfs_linux.h\t2007-11-16 16:22:40.000000000 +1100\n" "> +++ b/fs/xfs/linux-2.6/xfs_linux.h\t2007-11-16 15:59:22.299466117 +1100\n" "> @@ -143,43 +143,17 @@\n" @@ -135,8 +137,10 @@ "> #define EWRONGFS\tEINVAL\t\t/* Mount with wrong filesystem type */\n" "> #define EFSCORRUPTED\tEUCLEAN\t\t/* Filesystem is corrupted */\n" "> \n" - "> =====================================> Index: fs/xfs/linux-2.6/xfs_lrw.c\n" - "> =====================================> \n" + "> ===========================================================================\n" + "> Index: fs/xfs/linux-2.6/xfs_lrw.c\n" + "> ===========================================================================\n" + "> \n" "> --- a/fs/xfs/linux-2.6/xfs_lrw.c\t2007-11-16 16:22:40.000000000 +1100\n" "> +++ b/fs/xfs/linux-2.6/xfs_lrw.c\t2007-11-15 11:32:12.451249159 +1100\n" "> @@ -254,9 +254,8 @@ xfs_read(\n" @@ -153,7 +157,7 @@ "> \t\t\txfs_iunlock(ip, XFS_IOLOCK_SHARED);\n" "> @@ -742,9 +741,9 @@ retry:\n" "> \t\tif (VN_CACHED(vp)) {\n" - "> \t\t\tWARN_ON(need_i_mutex = 0);\n" + "> \t\t\tWARN_ON(need_i_mutex == 0);\n" "> \t\t\txfs_inval_cached_trace(xip, pos, -1,\n" "> -\t\t\t\t\tctooff(offtoct(pos)), -1);\n" "> +\t\t\t\t\t(pos & PAGE_CACHE_MASK), -1);\n" @@ -164,8 +168,10 @@ "> \t\t\tif (error)\n" "> \t\t\t\tgoto out_unlock_internal;\n" "> \n" - "> =====================================> Index: fs/xfs/quota/xfs_qm.h\n" - "> =====================================> \n" + "> ===========================================================================\n" + "> Index: fs/xfs/quota/xfs_qm.h\n" + "> ===========================================================================\n" + "> \n" "> --- a/fs/xfs/quota/xfs_qm.h\t2007-11-16 16:22:40.000000000 +1100\n" "> +++ b/fs/xfs/quota/xfs_qm.h\t2007-11-16 15:39:53.373375739 +1100\n" "> @@ -52,8 +52,8 @@ extern kmem_zone_t\t*qm_dqtrxzone;\n" @@ -180,8 +186,10 @@ "> /*\n" "> * This defines the unit of allocation of dquots.\n" "> \n" - "> =====================================> Index: fs/xfs/xfs_bmap.c\n" - "> =====================================> \n" + "> ===========================================================================\n" + "> Index: fs/xfs/xfs_bmap.c\n" + "> ===========================================================================\n" + "> \n" "> --- a/fs/xfs/xfs_bmap.c\t2007-11-16 16:22:41.000000000 +1100\n" "> +++ b/fs/xfs/xfs_bmap.c\t2007-11-16 15:40:27.017050666 +1100\n" "> @@ -2830,11 +2830,11 @@ xfs_bmap_btalloc(\n" @@ -199,8 +207,10 @@ "> \t\t\targs.mod = (xfs_extlen_t)(args.prod - args.mod);\n" "> \t}\n" "> \n" - "> =====================================> Index: fs/xfs/xfs_itable.c\n" - "> =====================================> \n" + "> ===========================================================================\n" + "> Index: fs/xfs/xfs_itable.c\n" + "> ===========================================================================\n" + "> \n" "> --- a/fs/xfs/xfs_itable.c\t2007-11-16 16:22:40.000000000 +1100\n" "> +++ b/fs/xfs/xfs_itable.c\t2007-11-16 16:05:51.381600461 +1100\n" "> @@ -393,7 +393,7 @@ xfs_bulkstat(\n" @@ -222,8 +232,10 @@ "> \terror = bufidx = 0;\n" "> \tcur = NULL;\n" "> \n" - "> =====================================> Index: fs/xfs/xfs_log.c\n" - "> =====================================> \n" + "> ===========================================================================\n" + "> Index: fs/xfs/xfs_log.c\n" + "> ===========================================================================\n" + "> \n" "> --- a/fs/xfs/xfs_log.c\t2007-11-16 16:22:40.000000000 +1100\n" "> +++ b/fs/xfs/xfs_log.c\t2007-11-16 15:56:42.615917720 +1100\n" "> @@ -1552,7 +1552,7 @@ xlog_dealloc_log(xlog_t *log)\n" @@ -252,8 +264,10 @@ "> \tspin_lock(&log->l_icloglock);\n" "> \n" "> \n" - "> =====================================> Index: fs/xfs/xfs_vnodeops.c\n" - "> =====================================> \n" + "> ===========================================================================\n" + "> Index: fs/xfs/xfs_vnodeops.c\n" + "> ===========================================================================\n" + "> \n" "> --- a/fs/xfs/xfs_vnodeops.c\t2007-11-16 16:22:41.000000000 +1100\n" "> +++ b/fs/xfs/xfs_vnodeops.c\t2007-11-16 15:57:01.449505791 +1100\n" "> @@ -4164,15 +4164,12 @@ xfs_free_file_space(\n" @@ -280,4 +294,4 @@ "> \n" > -39688c97b77c561ecc17b2d6f12c49d0c49fad394d1da8db45ebefa3ba745100 +a42001ef243baea88dfc06d395b423b798d4fdc7f55bde5319f147be0e3983c8
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.