Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-pz0-f42.google.com ([209.85.210.42]:65034 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932908Ab1JaPQn (ORCPT ); Mon, 31 Oct 2011 11:16:43 -0400 Received: by pzk36 with SMTP id 36so18679160pzk.1 for ; Mon, 31 Oct 2011 08:16:42 -0700 (PDT) From: Peng Tao To: linux-nfs@vger.kernel.org Cc: Trond.Myklebust@netapp.com, bhalevy@tonian.com, Peng Tao Subject: [PATCH 2/2] nfs41: handle BLK_LAYOUT CB_RECALL_ANY Date: Mon, 31 Oct 2011 08:15:36 -0700 Message-Id: <1320074136-3087-2-git-send-email-bergwolf@gmail.com> In-Reply-To: <1320074136-3087-1-git-send-email-bergwolf@gmail.com> References: <1320074136-3087-1-git-send-email-bergwolf@gmail.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: For blocklayout, we need to issue layoutreturn to return layouts when handling CB_RECALL_ANY. Signed-off-by: Peng Tao --- fs/nfs/callback_proc.c | 55 +++++++++++++++++++++++++++++++++++++++++------- include/linux/nfs4.h | 3 +- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 43926ad..11f79c2 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -160,7 +160,8 @@ static u32 initiate_file_draining(struct nfs_client *clp, } static u32 initiate_bulk_draining(struct nfs_client *clp, - struct cb_layoutrecallargs *args) + struct cb_layoutrecallargs *args, + int sendreturn) { struct nfs_server *server; struct pnfs_layout_hdr *lo; @@ -204,12 +205,47 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, list_del_init(&lo->plh_bulk_recall); spin_unlock(&ino->i_lock); pnfs_free_lseg_list(&free_me_list); + if (sendreturn && list_empty(&lo->plh_segs)) + pnfs_return_layout(ino); put_layout_hdr(lo); iput(ino); } return rv; } +struct recallany_data { + struct nfs_client *clp; + struct work_struct ra_work; +}; + +static void layout_recallany_draining(struct work_struct *work) +{ + struct recallany_data *ra; + struct cb_layoutrecallargs args; + + memset(&args, 0, sizeof(args)); + ra = container_of(work, struct recallany_data, ra_work); + /* Ignore draining error. Per RFC, if layoutreturns are not sent, it is up + * to server to handle the situation (e.g., send specific layoutrecalls). + */ + initiate_bulk_draining(ra->clp, &args, 1); + kfree(ra); +} + +static u32 init_recallany_draining(struct nfs_client *clp) +{ + struct recallany_data *ra; + + ra = kmalloc(sizeof(*ra), GFP_NOFS); + if (ra) { + ra->clp = clp; + INIT_WORK(&ra->ra_work, layout_recallany_draining); + schedule_work(&ra->ra_work); + return NFS4_OK; + } + return NFS4ERR_DELAY; +} + static u32 do_callback_layoutrecall(struct nfs_client *clp, struct cb_layoutrecallargs *args) { @@ -220,8 +256,10 @@ static u32 do_callback_layoutrecall(struct nfs_client *clp, goto out; if (args->cbl_recall_type == RETURN_FILE) res = initiate_file_draining(clp, args); + if (args->cbl_recall_type == RETURN_ANY) + res = init_recallany_draining(clp); else - res = initiate_bulk_draining(clp, args); + res = initiate_bulk_draining(clp, args, 0); clear_bit(NFS4CLNT_LAYOUTRECALL, &clp->cl_state); out: dprintk("%s returning %i\n", __func__, res); @@ -245,15 +283,13 @@ __be32 nfs4_callback_layoutrecall(struct cb_layoutrecallargs *args, return cpu_to_be32(res); } -static void pnfs_recall_all_layouts(struct nfs_client *clp) +static __be32 pnfs_recall_all_layouts(struct nfs_client *clp, uint32_t type) { struct cb_layoutrecallargs args; - /* Pretend we got a CB_LAYOUTRECALL(ALL) */ memset(&args, 0, sizeof(args)); - args.cbl_recall_type = RETURN_ALL; - /* FIXME we ignore errors, what should we do? */ - do_callback_layoutrecall(clp, &args); + args.cbl_recall_type = type; + return cpu_to_be32(do_callback_layoutrecall(clp, &args)); } __be32 nfs4_callback_devicenotify(struct cb_devicenotifyargs *args, @@ -533,7 +569,10 @@ __be32 nfs4_callback_recallany(struct cb_recallanyargs *args, void *dummy, flags |= FMODE_WRITE; if (test_bit(RCA4_TYPE_MASK_FILE_LAYOUT, (const unsigned long *) &args->craa_type_mask)) - pnfs_recall_all_layouts(cps->clp); + pnfs_recall_all_layouts(cps->clp, RETURN_ALL); + if (test_bit(RCA4_TYPE_MASK_BLK_LAYOUT, (const unsigned long *) + &args->craa_type_mask)) + status = pnfs_recall_all_layouts(cps->clp, RETURN_ANY); if (flags) nfs_expire_all_delegation_types(cps->clp, flags); out: diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index 76f99e8..1f71a9e 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -597,7 +597,8 @@ enum pnfs_layouttype { enum pnfs_layoutreturn_type { RETURN_FILE = 1, RETURN_FSID = 2, - RETURN_ALL = 3 + RETURN_ALL = 3, + RETURN_ANY = 4 }; enum pnfs_iomode { -- 1.7.1.262.g5ef3d