Subject: [PATCH] NFS: Use sizeof() instead of C macro Replace a C macro with sizeof(). Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust --- fs/nfs/direct.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff -X /home/cel/src/linux/dont-diff -Naurp 07-nfs-large-io/fs/nfs/direct.c 10-nfs-direct-write-verf/fs/nfs/direct.c --- 07-nfs-large-io/fs/nfs/direct.c 2004-10-18 17:55:07.000000000 -0400 +++ 10-nfs-direct-write-verf/fs/nfs/direct.c 2004-10-21 10:40:02.470533000 -0400 @@ -52,7 +52,6 @@ #include #define NFSDBG_FACILITY NFSDBG_VFS -#define VERF_SIZE (2 * sizeof(__u32)) #define MAX_DIRECTIO_SIZE (4096UL << PAGE_SHIFT) @@ -303,11 +302,11 @@ retry: if (tot_bytes == 0) memcpy(&first_verf.verifier, &wdata.verf.verifier, - VERF_SIZE); + sizeof(first_verf.verifier)); if (wdata.verf.committed != NFS_FILE_SYNC) { need_commit = 1; - if (memcmp(&first_verf.verifier, - &wdata.verf.verifier, VERF_SIZE)) + if (memcmp(&first_verf.verifier, &wdata.verf.verifier, + sizeof(first_verf.verifier))); goto sync_retry; } @@ -331,8 +330,8 @@ retry: unlock_kernel(); if (result < 0 || memcmp(&first_verf.verifier, - &wdata.verf.verifier, - VERF_SIZE) != 0) + &wdata.verf.verifier, + sizeof(first_verf.verifier)) != 0) goto sync_retry; } result = tot_bytes;