jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix cherry-pick of “linux: 2.6.38: New d_op handling”

Browse Source 
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>
Reviewed-on: http://gerrit.openafs.org/4596
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Anders Kaseorg 2011-04-30 23:35:02 -04:00 committed by Jeffrey Altman
parent 95e6d159a4
commit a68bdaf302
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/afs/LINUX/osi_vfsops.c
View File

@ -145,7 +145,6 @@ afs_read_super(struct super_block *sb, void *data, int silent)
sb->s_d_op = &afs_dentry_operations;
#endif
#if defined(AFS_LINUX26_ENV)
/* used for inodes backing_dev_info field, also */
afs_backing_dev_info = osi_Alloc(sizeof(struct backing_dev_info));
#if defined(HAVE_BDI_INIT)