source: branches/fc15-dev/server/common/patches/openafs-0009-fix-broken-earlier.patch @ 1878

Last change on this file since 1878 was 1835, checked in by achernya, 13 years ago
OpenAFS builds on F15 Get OpenAFS to build on F15, using the cherry-picked patches.
File size: 1.8 KB

  • src/afs/LINUX/osi_vfsops.c 

    From 1f4c2d96550e8c51178a68633965e4f0b788bc39 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 30 Apr 2011 23:35:02 -0400
Subject: [PATCH] =?UTF-8?q?Fix=20cherry-pick=20of=20=E2=80=9Clinux:=202.6.38:=20New=20d=5Fop=20handling=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Conflicts in this cherry-pick (http://gerrit.openafs.org/4041) were
resolved incorrectly.  The correct resolution of
"""
 <<<<<<< HEAD
 ||||||| parent of 0d95e6b... linux: 2.6.38: New d_op handling
 #if defined(AFS_LINUX26_ENV)
 =======

 #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
     sb->s_d_op = &afs_dentry_operations;
 #endif

 #if defined(AFS_LINUX26_ENV)
 >>>>>>> 0d95e6b... linux: 2.6.38: New d_op handling
"""
is
"""

 #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
     sb->s_d_op = &afs_dentry_operations;
 #endif

"""
and not
"""

 #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP)
     sb->s_d_op = &afs_dentry_operations;
 #endif

 #if defined(AFS_LINUX26_ENV)
"""

As usual, it’s impossible to tell the difference in the default
conflict style, so I urge everyone reading this to run

git config --global merge.conflictstyle diff3

Change-Id: I09fb77b2f1d80beda7b81fa1f40f663117dae920
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 src/afs/LINUX/osi_vfsops.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c
index 2a937e4..904bd79 100644
    a b afs_read_super(struct super_block *sb, void *data, int silent) 
    145145    sb->s_d_op = &afs_dentry_operations;
    146146#endif
    147147
    148 #if defined(AFS_LINUX26_ENV)
    149148    /* used for inodes backing_dev_info field, also */
    150149    afs_backing_dev_info = osi_Alloc(sizeof(struct backing_dev_info));
    151150#if defined(HAVE_BDI_INIT)
Note: See TracBrowser for help on using the repository browser.