From c9531922bb5d4285d69d1385b1cff115d0445504 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@sgi.com>
Date: Fri, 25 Nov 2005 16:41:47 +1100
Subject: [PATCH] --- yaml --- r: 14686 b: refs/heads/master c:
 f33c6797bccc695c4c85885f2c676ad4c8fed98d h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/xfs/xfs_fsops.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 744a11a2fd1f..d986eaa4a0ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55b02d74e126df70fb6b92a0e4e4bed2f0a13fe4
+refs/heads/master: f33c6797bccc695c4c85885f2c676ad4c8fed98d
diff --git a/trunk/fs/xfs/xfs_fsops.c b/trunk/fs/xfs/xfs_fsops.c
index 7ceabd0e2d9d..d1236d6f4045 100644
--- a/trunk/fs/xfs/xfs_fsops.c
+++ b/trunk/fs/xfs/xfs_fsops.c
@@ -550,7 +550,7 @@ xfs_fs_goingdown(
 		struct vfs *vfsp = XFS_MTOVFS(mp);
 		struct super_block *sb = freeze_bdev(vfsp->vfs_super->s_bdev);
 
-		if (sb) {
+		if (sb && !IS_ERR(sb)) {
 			xfs_force_shutdown(mp, XFS_FORCE_UMOUNT);
 			thaw_bdev(sb->s_bdev, sb);
 		}