From patchwork Wed May 11 19:38:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 12846586 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 98362C433F5 for ; Wed, 11 May 2022 19:38:53 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 7914B21C93B; Wed, 11 May 2022 12:38:51 -0700 (PDT) Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 8C37C216163 for ; Wed, 11 May 2022 12:38:47 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 884C8ED3; Wed, 11 May 2022 15:38:45 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 7C6AF5894B; Wed, 11 May 2022 15:38:45 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown , Sebastien Buisson Date: Wed, 11 May 2022 15:38:39 -0400 Message-Id: <1652297923-16141-2-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> References: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 1/5] lustre: uapi: fallocate interop for 2.14 clients X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arshad Hussain , Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Arshad Hussain fallocate() start and end are passed in o_size and o_blocks on the wire. Clients 2.15.0 and newer should always set the OBD_MD_FLSIZE and OBD_MD_FLBLOCKS valid flags, but some older client versions did not. We permit older clients to not set these flags, checking their version by proxy using the missing OBD_CONNECT_TRUNCLOCK to imply 2.14.0 or older. WC-bug-id: https://jira.whamcloud.com/browse/LU-15748 Lustre-commit: 79053592966792a21 ("LU-15748 osc: fallocate interop for 2.14 clients") Signed-off-by: Arshad Hussain Reviewed-on: https://review.whamcloud.com/47098 Reviewed-by: Andreas Dilger Reviewed-by: Patrick Farrell Signed-off-by: James Simmons --- include/uapi/linux/lustre/lustre_idl.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uapi/linux/lustre/lustre_idl.h b/include/uapi/linux/lustre/lustre_idl.h index 753df16..37db3ee 100644 --- a/include/uapi/linux/lustre/lustre_idl.h +++ b/include/uapi/linux/lustre/lustre_idl.h @@ -691,6 +691,9 @@ struct ptlrpc_body_v2 { #define OBD_CONNECT_ACL 0x80ULL /*access control lists */ #define OBD_CONNECT_XATTR 0x100ULL /*client use extended attr */ #define OBD_CONNECT_LARGE_ACL 0x200ULL /* more than 32 ACL entries */ +/* was OBD_CONNECT_TRUNCLOCK 0x400ULL *locks on server for punch */ +/* temporary reuse until 2.21.53 to indicate pre-2.15 client, see LU-15478 */ +#define OBD_CONNECT_OLD_FALLOC 0x400ULL /* missing o_valid flags */ #define OBD_CONNECT_TRANSNO 0x800ULL /*replay sends init transno */ #define OBD_CONNECT_IBITS 0x1000ULL /* not checked in 2.11+ */ #define OBD_CONNECT_BARRIER 0x2000ULL /* write barrier. Resevered to From patchwork Wed May 11 19:38:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 12846589 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA1E0C433EF for ; Wed, 11 May 2022 19:39:01 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id AB31C21C914; Wed, 11 May 2022 12:38:58 -0700 (PDT) Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id D021E216163 for ; Wed, 11 May 2022 12:38:47 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 8A61EED4; Wed, 11 May 2022 15:38:45 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 81C075894D; Wed, 11 May 2022 15:38:45 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown , Sebastien Buisson Date: Wed, 11 May 2022 15:38:40 -0400 Message-Id: <1652297923-16141-3-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> References: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 2/5] lustre: obdclass: llog to handle gaps X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Alex Zhuravlev due to old errors an update llog can contain gaps in index. this shouldn't block llog processing and recovery. actual gaps in transaction sequence should be catched by VBR. WC-bug-id: https://jira.whamcloud.com/browse/LU-15645 Signed-off-by: Alex Zhuravlev Reviewed-on: https://review.whamcloud.com/46837 Reviewed-by: Andreas Dilger Reviewed-by: Alexander Boyko Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- fs/lustre/obdclass/llog.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/fs/lustre/obdclass/llog.c b/fs/lustre/obdclass/llog.c index 768bc47..acede87 100644 --- a/fs/lustre/obdclass/llog.c +++ b/fs/lustre/obdclass/llog.c @@ -430,23 +430,16 @@ static int llog_process_thread(void *arg) continue; } - if (rec->lrh_index != index) { - /* - * the last time we couldn't parse the block due - * to corruption, thus has no idea about the - * next index, take it from the block, once. + if (rec->lrh_index > index) { + /* the record itself looks good, but we met a + * gap which can be result of old bugs, just + * keep going */ - if (refresh_idx) { - refresh_idx = false; - index = rec->lrh_index; - } else { - CERROR("%s: "DFID" Invalid record: index %u but expected %u\n", - loghandle2name(loghandle), - PFID(&loghandle->lgh_id.lgl_oi.oi_fid), - rec->lrh_index, index); - rc = -ERANGE; - goto out; - } + CERROR("%s: "DFID" index %u, expected %u\n", + loghandle2name(loghandle), + PFID(&loghandle->lgh_id.lgl_oi.oi_fid), + rec->lrh_index, index); + index = rec->lrh_index; } CDEBUG(D_OTHER, From patchwork Wed May 11 19:38:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 12846587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D8971C433EF for ; Wed, 11 May 2022 19:38:55 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id A682521C96F; Wed, 11 May 2022 12:38:53 -0700 (PDT) Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 152E4216163 for ; Wed, 11 May 2022 12:38:48 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 8FA41ED5; Wed, 11 May 2022 15:38:45 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 8666D58950; Wed, 11 May 2022 15:38:45 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown , Sebastien Buisson Date: Wed, 11 May 2022 15:38:41 -0400 Message-Id: <1652297923-16141-4-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> References: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 3/5] lustre: sec: correctly handle page lock in ll_io_zero_page X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Sebastien Buisson In ll_io_zero_page(), we need to make sure we have locked the page, and it is up-to-date, before zeroing. So modify ll_io_read_page() behavior to not disown the clpage for our use case. It avoids being exposed to concurrent modifications. WC-bug-id: https://jira.whamcloud.com/browse/LU-15803 Lustre-commit: edcd05e5ac035dd1d ("LU-15803 sec: correctly handle page lock in ll_io_zero_page") Signed-off-by: Sebastien Buisson Reviewed-on: https://review.whamcloud.com/47170 Reviewed-by: Andreas Dilger Reviewed-by: Patrick Farrell Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- fs/lustre/llite/llite_lib.c | 20 ++++++++++---------- fs/lustre/llite/rw.c | 11 +++++++++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/fs/lustre/llite/llite_lib.c b/fs/lustre/llite/llite_lib.c index 8c0a3e0..ad77ef0 100644 --- a/fs/lustre/llite/llite_lib.c +++ b/fs/lustre/llite/llite_lib.c @@ -1831,7 +1831,6 @@ int ll_io_zero_page(struct inode *inode, pgoff_t index, pgoff_t offset, struct cl_2queue *queue = NULL; struct cl_sync_io *anchor = NULL; bool holdinglock = false; - bool lockedbymyself = true; int rc; env = cl_env_get(&refcheck); @@ -1888,8 +1887,10 @@ int ll_io_zero_page(struct inode *inode, pgoff_t index, pgoff_t offset, if (!PageUptodate(vmpage) && !PageDirty(vmpage) && !PageWriteback(vmpage)) { /* read page */ - /* set PagePrivate2 to detect special case of empty page - * in osc_brw_fini_request() + /* Set PagePrivate2 to detect special case of empty page + * in osc_brw_fini_request(). + * It is also used to tell ll_io_read_page() that we do not + * want the vmpage to be unlocked. */ SetPagePrivate2(vmpage); rc = ll_io_read_page(env, io, clpage, NULL); @@ -1900,17 +1901,18 @@ int ll_io_zero_page(struct inode *inode, pgoff_t index, pgoff_t offset, * file, we must not zero and write as below. Subsequent * server-side truncate will handle things correctly. */ + cl_page_unassume(env, io, clpage); rc = 0; goto clpfini; } ClearPagePrivate2(vmpage); if (rc) goto clpfini; - lockedbymyself = trylock_page(vmpage); - cl_page_assume(env, io, clpage); } - /* zero range in page */ + /* Thanks to PagePrivate2 flag, ll_io_read_page() did not unlock + * the vmpage, so we are good to proceed and zero range in page. + */ zero_user(vmpage, offset, len); if (holdinglock && clpage) { @@ -1940,10 +1942,8 @@ int ll_io_zero_page(struct inode *inode, pgoff_t index, pgoff_t offset, if (clpage) cl_page_put(env, clpage); pagefini: - if (lockedbymyself) { - unlock_page(vmpage); - put_page(vmpage); - } + unlock_page(vmpage); + put_page(vmpage); rellock: if (holdinglock) cl_lock_release(env, lock); diff --git a/fs/lustre/llite/rw.c b/fs/lustre/llite/rw.c index 0ddd920..bd02a28 100644 --- a/fs/lustre/llite/rw.c +++ b/fs/lustre/llite/rw.c @@ -1630,18 +1630,24 @@ int ll_io_read_page(const struct lu_env *env, struct cl_io *io, struct vvp_io *vio = vvp_env_io(env); bool mmap = !vio->vui_ra_valid; struct cl_sync_io *anchor = NULL; + bool unlockpage = true, uptodate; pgoff_t ra_start_index = 0; pgoff_t io_start_index; pgoff_t io_end_index; int rc = 0, rc2 = 0; struct vvp_page *vpg; - bool uptodate; if (file) { fd = file->private_data; ras = &fd->fd_ras; } + /* PagePrivate2 is set in ll_io_zero_page() to tell us the vmpage + * must not be unlocked after processing. + */ + if (page->cp_vmpage && PagePrivate2(page->cp_vmpage)) + unlockpage = false; + vpg = cl2vvp_page(cl_object_page_slice(page->cp_obj, page)); uptodate = vpg->vpg_defer_uptodate; @@ -1721,7 +1727,8 @@ int ll_io_read_page(const struct lu_env *env, struct cl_io *io, */ cl_page_discard(env, io, page); } - cl_page_disown(env, io, page); + if (unlockpage) + cl_page_disown(env, io, page); } /* TODO: discard all pages until page reinit route is implemented */ From patchwork Wed May 11 19:38:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 12846588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B44FC433FE for ; Wed, 11 May 2022 19:38:57 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id ABFB321C993; Wed, 11 May 2022 12:38:54 -0700 (PDT) Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 97C2A216163 for ; Wed, 11 May 2022 12:38:48 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 97D04ED7; Wed, 11 May 2022 15:38:45 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 89C2C58951; Wed, 11 May 2022 15:38:45 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown , Sebastien Buisson Date: Wed, 11 May 2022 15:38:42 -0400 Message-Id: <1652297923-16141-5-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> References: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 4/5] lustre: llite: disable fast_read and workaround X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: "John L. Hammond" Revert the fast_read stale data workaround from LU-14541 and disable fast_read by default. The workaround causes applications to receive spurious SIGBUGs when reclaim is concurrent with mmap page fault handlers. We disable fast read to avoid the stale data issue entirely. This reverts commit 15caffd4dc36c45f53458c2d6493f07b95acf507 and re-exposes us to the consistency issues described in LU-14541. WC-bug-id: https://jira.whamcloud.com/browse/LU-15815 Lustre-commit: 201ade9442828fbb3 ("LU-15815 llite: disable fast_read and workaround") Signed-off-by: John L. Hammond Reviewed-on: https://review.whamcloud.com/47204 Reviewed-by: Patrick Farrell Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin Signed-off-by: James Simmons --- fs/lustre/llite/llite_lib.c | 2 +- fs/lustre/llite/vvp_page.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/lustre/llite/llite_lib.c b/fs/lustre/llite/llite_lib.c index ad77ef0..4578a9e 100644 --- a/fs/lustre/llite/llite_lib.c +++ b/fs/lustre/llite/llite_lib.c @@ -169,7 +169,7 @@ static struct ll_sb_info *ll_init_sbi(void) atomic_set(&sbi->ll_sa_running, 0); atomic_set(&sbi->ll_agl_total, 0); set_bit(LL_SBI_AGL_ENABLED, sbi->ll_flags); - set_bit(LL_SBI_FAST_READ, sbi->ll_flags); + /* Disable LL_SBI_FAST_READ by default, see LU-15815. */ set_bit(LL_SBI_TINY_WRITE, sbi->ll_flags); set_bit(LL_SBI_PARALLEL_DIO, sbi->ll_flags); ll_sbi_set_encrypt(sbi, true); diff --git a/fs/lustre/llite/vvp_page.c b/fs/lustre/llite/vvp_page.c index 1e95ede..7744e9b 100644 --- a/fs/lustre/llite/vvp_page.c +++ b/fs/lustre/llite/vvp_page.c @@ -164,12 +164,6 @@ static void vvp_page_delete(const struct lu_env *env, ClearPagePrivate(vmpage); vmpage->private = 0; - - /** - * Vmpage might not be released due page refcount != 2, - * clear Page uptodate here to avoid stale data. - */ - ClearPageUptodate(vmpage); /* * Reference from vmpage to cl_page is removed, but the reference back * is still here. It is removed later in vvp_page_fini(). From patchwork Wed May 11 19:38:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 12846590 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8E0E6C433FE for ; Wed, 11 May 2022 19:39:04 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id B15DE21C990; Wed, 11 May 2022 12:39:01 -0700 (PDT) Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 60470216163 for ; Wed, 11 May 2022 12:38:48 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id 97B88ED6; Wed, 11 May 2022 15:38:45 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 8E6E658952; Wed, 11 May 2022 15:38:45 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown , Sebastien Buisson Date: Wed, 11 May 2022 15:38:43 -0400 Message-Id: <1652297923-16141-6-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> References: <1652297923-16141-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 5/5] lustre: update version to 2.15.0 X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Oleg Drokin New tag 2.15.0 Signed-off-by: Oleg Drokin Signed-off-by: James Simmons --- include/uapi/linux/lustre/lustre_ver.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/lustre/lustre_ver.h b/include/uapi/linux/lustre/lustre_ver.h index 5cba95e..a17edd6 100644 --- a/include/uapi/linux/lustre/lustre_ver.h +++ b/include/uapi/linux/lustre/lustre_ver.h @@ -2,10 +2,10 @@ #define _LUSTRE_VER_H_ #define LUSTRE_MAJOR 2 -#define LUSTRE_MINOR 14 -#define LUSTRE_PATCH 57 +#define LUSTRE_MINOR 15 +#define LUSTRE_PATCH 0 #define LUSTRE_FIX 0 -#define LUSTRE_VERSION_STRING "2.14.57" +#define LUSTRE_VERSION_STRING "2.15.0" #define OBD_OCD_VERSION(major, minor, patch, fix) \ (((major) << 24) + ((minor) << 16) + ((patch) << 8) + (fix))