From: Russ Allbery <rra@debian.org>
Date: Tue, 1 Mar 2011 00:56:25 +0000 (-0800)
Subject: Fix merge problem with the Linux 2.6.38 changes
X-Git-Tag: debian/1.4.14+dfsg-2~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3b7a0af29212eee87046bbdf4454ba26dfa5aa60;p=packages%2Fo%2Fopenafs.git

Fix merge problem with the Linux 2.6.38 changes
---

diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c
index ae8078100..d6d8ded8d 100644
--- a/src/afs/LINUX/osi_vfsops.c
+++ b/src/afs/LINUX/osi_vfsops.c
@@ -159,6 +159,7 @@ afs_read_super(struct super_block *sb, void *data, int silent)
     sb->s_bdi = afs_backing_dev_info;
     /* The name specified here will appear in the flushing thread name - flush-afs */
     bdi_register(afs_backing_dev_info, NULL, "afs");
+# endif
 #endif
 #if defined(MAX_NON_LFS)
 #ifdef AFS_64BIT_CLIENT