From: Benny Halevy <benny@tonian.com>
To: Boaz Harrosh <bharrosh@panasas.com>
Cc: Benny Halevy <bhalevy@panasas.com>, NFS list <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH] SQUASHME: pnfsd: Fix compile breakage when !CONFIG_PNFSD
Date: Tue, 09 Aug 2011 23:56:34 +0300 [thread overview]
Message-ID: <4E419F02.4060607@tonian.com> (raw)
In-Reply-To: <4E419971.8040006@panasas.com>
On 2011-08-09 23:32, Boaz Harrosh wrote:
>
> The _roc patch broke the !CONFIG_PNFSD compilation. Fix that!
>
> Benny sorry for the breakage.
>
> BTW:
> [PATCH] pnfsd: rename pnfs_roc to pnfsd_roc
> should be:
> [PATCH] SQUASHME: pnfsd: rename pnfs_roc to pnfsd_roc
It is in the 3.1 tree, not in pnfs-all-3.0 as the latter won't be squashed ever.
>
> This patch is ontop of that one
>
> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Merged. Thanks!
Benny
> ---
> fs/nfsd/pnfsd.h | 1 -
> fs/nfsd/state.h | 2 ++
> 2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/fs/nfsd/pnfsd.h b/fs/nfsd/pnfsd.h
> index 541376e..8e7dd71 100644
> --- a/fs/nfsd/pnfsd.h
> +++ b/fs/nfsd/pnfsd.h
> @@ -125,7 +125,6 @@ int nfs4_pnfs_cb_change_state(struct pnfs_get_state *);
> void nfs4_ds_get_verifier(stateid_t *, struct super_block *, u32 *);
> int put_layoutrecall(struct nfs4_layoutrecall *);
> void nomatching_layout(struct nfs4_layoutrecall *);
> -void pnfsd_roc(struct nfs4_client *clp, struct nfs4_file *fp);
> void *layoutrecall_done(struct nfs4_layoutrecall *);
> void nfsd4_cb_layout(struct nfs4_layoutrecall *);
> int nfsd_layout_recall_cb(struct super_block *, struct inode *,
> diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
> index 9b7552c..cba9140 100644
> --- a/fs/nfsd/state.h
> +++ b/fs/nfsd/state.h
> @@ -519,12 +519,14 @@ extern void nfs4_pnfs_state_init(void);
> extern void nfs4_pnfs_state_shutdown(void);
> extern void nfs4_ds_get_verifier(stateid_t *, struct super_block *, u32 *);
> extern int nfs4_preprocess_pnfs_ds_stateid(struct svc_fh *, stateid_t *);
> +extern void pnfsd_roc(struct nfs4_client *clp, struct nfs4_file *fp);
> #else /* CONFIG_PNFSD */
> static inline void nfsd4_free_pnfs_slabs(void) {}
> static inline int nfsd4_init_pnfs_slabs(void) { return 0; }
> static inline void pnfs_expire_client(struct nfs4_client *clp) {}
> static inline void release_pnfs_ds_dev_list(struct nfs4_stateid *stp) {}
> static inline void nfs4_pnfs_state_shutdown(void) {}
> +static inline void pnfsd_roc(struct nfs4_client *clp, struct nfs4_file *fp){}
> #endif /* CONFIG_PNFSD */
>
> static inline void
prev parent reply other threads:[~2011-08-09 20:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-09 20:32 [PATCH] SQUASHME: pnfsd: Fix compile breakage when !CONFIG_PNFSD Boaz Harrosh
2011-08-09 20:56 ` Benny Halevy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E419F02.4060607@tonian.com \
--to=benny@tonian.com \
--cc=bhalevy@panasas.com \
--cc=bharrosh@panasas.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox