From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 17 Jul 2007 11:04:34 +0000 (-0700)
Subject: nfsd warning fix
X-Git-Tag: v2.6.23-rc1~662
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=12127498c8f5e479df15ee374a0932f5659df49e;p=linux-2.6-omap-h63xx.git

nfsd warning fix

gcc-4.3:

fs/nfsd/nfsctl.c: In function 'write_getfs':
fs/nfsd/nfsctl.c:248: warning: cast from pointer to integer of different size

Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 71c686dc725..5ab80edc795 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -245,7 +245,7 @@ static ssize_t write_getfs(struct file *file, char *buf, size_t size)
 	}
 	exp_readunlock();
 	if (err == 0)
-		err = res->fh_size + (int)&((struct knfsd_fh*)0)->fh_base;
+		err = res->fh_size + offsetof(struct knfsd_fh, fh_base);
  out:
 	return err;
 }