From 8c915162a8660a8e4203f53dcc07e7a484a480c5 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 17 Jul 2007 04:04:34 -0700
Subject: [PATCH] --- yaml --- r: 60820 b: refs/heads/master c:
 12127498c8f5e479df15ee374a0932f5659df49e h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfsd/nfsctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3216465bd249..d665fefe18ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 019ab801cf32381b90cbe0144cc5695aed0e408c
+refs/heads/master: 12127498c8f5e479df15ee374a0932f5659df49e
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 71c686dc7257..5ab80edc795b 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/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;
 }