From patchwork Mon Jan 21 14:54:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2012871 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B952B3FDD2 for ; Mon, 21 Jan 2013 14:54:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753799Ab3AUOy4 (ORCPT ); Mon, 21 Jan 2013 09:54:56 -0500 Received: from mail-ee0-f50.google.com ([74.125.83.50]:44031 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657Ab3AUOyz (ORCPT ); Mon, 21 Jan 2013 09:54:55 -0500 Received: by mail-ee0-f50.google.com with SMTP id e51so2993972eek.9 for ; Mon, 21 Jan 2013 06:54:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=H03Mki4GfEZYAgGsmWt7KCLevKRcdG2bDCYtrLP4aTY=; b=A/czPeN58peLWyH1J9eGxHkzyUl66T0mlMVeBecytKFOr7mX9ZvitfOmJik4JI6iVs 8W2pU8+/1jSF29ibaJI9g+xjF98BcEfiYvB6III+baKQvcTjYaq0z00FDJJeRmatch3s CgtzxRH+f465V2YpYzYHh4ND3fTqxituLGfrPP7UHedy0uNXiJoX6CG9+xKySM2295SQ gyVFxYYjaLY7ClFJ5jBoicDys/aMB5KxgL3YLwFd2e27UOdUe7ilB6yEtSvpl0RuAkvO LUEpWSNg6iG3PPYuhvpLQMyoHuVfMWD8joIBkLUP2zhn0d0qqp46JPBp78rjVPk1smDd B7dw== X-Received: by 10.14.203.2 with SMTP id e2mr60861399eeo.20.1358780094410; Mon, 21 Jan 2013 06:54:54 -0800 (PST) Received: from bhalevy-lt.il.tonian.com ([46.120.7.251]) by mx.google.com with ESMTPS id d3sm22623309eeo.13.2013.01.21.06.54.53 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 21 Jan 2013 06:54:53 -0800 (PST) From: Benny Halevy To: linux-nfs@vger.kernel.org Cc: Benny Halevy Subject: [PATCH 7/9] pnfsd: LR_FLAG_EMPTY layout return flag Date: Mon, 21 Jan 2013 16:54:51 +0200 Message-Id: <1358780091-6151-1-git-send-email-bhalevy@tonian.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <50FD5646.4020206@tonian.com> References: <50FD5646.4020206@tonian.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Benny Halevy --- fs/nfsd/nfs4pnfsd.c | 8 +++++++- include/linux/nfsd/nfsd4_pnfs.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4pnfsd.c b/fs/nfsd/nfs4pnfsd.c index 2d4f23d..0b8c502 100644 --- a/fs/nfsd/nfs4pnfsd.c +++ b/fs/nfsd/nfs4pnfsd.c @@ -921,15 +921,21 @@ struct super_block * struct inode *inode = lo->lo_file->fi_inode; struct nfsd4_pnfs_layoutreturn lr; bool empty; + int lr_flags = flags; memset(&lr, 0, sizeof(lr)); lr.args.lr_return_type = RETURN_FILE; lr.args.lr_seg = lo->lo_seg; + spin_lock(&layout_lock); + if (list_empty(&lo->lo_file->fi_layouts)) + lr_flags |= LR_FLAG_EMPTY; + spin_unlock(&layout_lock); + list_del(&lo->lo_perfile); empty = list_empty(lo_destroy_list); - fs_layout_return(inode, &lr, flags, empty ? cb_cookie : NULL); + fs_layout_return(inode, &lr, lr_flags, empty ? cb_cookie : NULL); destroy_layout(lo); /* this will put the lo_file */ } diff --git a/include/linux/nfsd/nfsd4_pnfs.h b/include/linux/nfsd/nfsd4_pnfs.h index bfea9a6..ecb412e 100644 --- a/include/linux/nfsd/nfsd4_pnfs.h +++ b/include/linux/nfsd/nfsd4_pnfs.h @@ -114,6 +114,7 @@ enum layoutreturn_flags { LR_FLAG_INTERN = 1 << 0, /* internal return */ LR_FLAG_EXPIRE = 1 << 1, /* return on client expiration */ LR_FLAG_CL_EMPTY = 1 << 2, /* No more layout for returning client */ + LR_FLAG_EMPTY = 1 << 3, /* No more layout for file */ }; struct nfsd4_pnfs_layoutreturn_arg {