Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx2.netapp.com ([216.240.18.37]:57390 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754409Ab2CUTq4 (ORCPT ); Wed, 21 Mar 2012 15:46:56 -0400 From: andros@netapp.com To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH Version 2 11/12] NFSv4.1 check for NULL pnfs_layout_hdr in pnfs scan commit lists Date: Wed, 21 Mar 2012 15:46:23 -0400 Message-Id: <1332359184-1887-12-git-send-email-andros@netapp.com> In-Reply-To: <1332359184-1887-1-git-send-email-andros@netapp.com> References: <1332359184-1887-1-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andy Adamson Signed-off-by: Andy Adamson --- fs/nfs/pnfs.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 442ebf6..3bd7e87 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -296,9 +296,10 @@ static inline int pnfs_scan_commit_lists(struct inode *inode, int max, spinlock_t *lock) { struct pnfs_layoutdriver_type *ld = NFS_SERVER(inode)->pnfs_curr_ld; + struct pnfs_layout_hdr *lh = NFS_I(inode)->layout; int ret; - if (ld == NULL || ld->scan_commit_lists == NULL) + if (ld == NULL || ld->scan_commit_lists == NULL || lh == NULL) return 0; ret = ld->scan_commit_lists(inode, max, lock); if (ret != 0) -- 1.7.6.4