| [1835] | 1 | From 1f4c2d96550e8c51178a68633965e4f0b788bc39 Mon Sep 17 00:00:00 2001 |
|---|
| 2 | From: Anders Kaseorg <andersk@mit.edu> |
|---|
| 3 | Date: Sat, 30 Apr 2011 23:35:02 -0400 |
|---|
| 4 | Subject: [PATCH] =?UTF-8?q?Fix=20cherry-pick=20of=20=E2=80=9Clinux:=202.6.38:=20New=20d=5Fop=20handling=E2=80=9D?= |
|---|
| 5 | MIME-Version: 1.0 |
|---|
| 6 | Content-Type: text/plain; charset=UTF-8 |
|---|
| 7 | Content-Transfer-Encoding: 8bit |
|---|
| 8 | |
|---|
| 9 | Conflicts in this cherry-pick (http://gerrit.openafs.org/4041) were |
|---|
| 10 | resolved incorrectly. The correct resolution of |
|---|
| 11 | """ |
|---|
| 12 | <<<<<<< HEAD |
|---|
| 13 | ||||||| parent of 0d95e6b... linux: 2.6.38: New d_op handling |
|---|
| 14 | #if defined(AFS_LINUX26_ENV) |
|---|
| 15 | ======= |
|---|
| 16 | |
|---|
| 17 | #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP) |
|---|
| 18 | sb->s_d_op = &afs_dentry_operations; |
|---|
| 19 | #endif |
|---|
| 20 | |
|---|
| 21 | #if defined(AFS_LINUX26_ENV) |
|---|
| 22 | >>>>>>> 0d95e6b... linux: 2.6.38: New d_op handling |
|---|
| 23 | """ |
|---|
| 24 | is |
|---|
| 25 | """ |
|---|
| 26 | |
|---|
| 27 | #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP) |
|---|
| 28 | sb->s_d_op = &afs_dentry_operations; |
|---|
| 29 | #endif |
|---|
| 30 | |
|---|
| 31 | """ |
|---|
| 32 | and not |
|---|
| 33 | """ |
|---|
| 34 | |
|---|
| 35 | #if defined(STRUCT_SUPER_BLOCK_HAS_S_D_OP) |
|---|
| 36 | sb->s_d_op = &afs_dentry_operations; |
|---|
| 37 | #endif |
|---|
| 38 | |
|---|
| 39 | #if defined(AFS_LINUX26_ENV) |
|---|
| 40 | """ |
|---|
| 41 | |
|---|
| 42 | As usual, it’s impossible to tell the difference in the default |
|---|
| 43 | conflict style, so I urge everyone reading this to run |
|---|
| 44 | |
|---|
| 45 | git config --global merge.conflictstyle diff3 |
|---|
| 46 | |
|---|
| 47 | Change-Id: I09fb77b2f1d80beda7b81fa1f40f663117dae920 |
|---|
| 48 | Signed-off-by: Anders Kaseorg <andersk@mit.edu> |
|---|
| 49 | --- |
|---|
| 50 | src/afs/LINUX/osi_vfsops.c | 1 - |
|---|
| 51 | 1 files changed, 0 insertions(+), 1 deletions(-) |
|---|
| 52 | |
|---|
| 53 | diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c |
|---|
| 54 | index 2a937e4..904bd79 100644 |
|---|
| 55 | --- a/src/afs/LINUX/osi_vfsops.c |
|---|
| 56 | +++ b/src/afs/LINUX/osi_vfsops.c |
|---|
| 57 | @@ -145,7 +145,6 @@ afs_read_super(struct super_block *sb, void *data, int silent) |
|---|
| 58 | sb->s_d_op = &afs_dentry_operations; |
|---|
| 59 | #endif |
|---|
| 60 | |
|---|
| 61 | -#if defined(AFS_LINUX26_ENV) |
|---|
| 62 | /* used for inodes backing_dev_info field, also */ |
|---|
| 63 | afs_backing_dev_info = osi_Alloc(sizeof(struct backing_dev_info)); |
|---|
| 64 | #if defined(HAVE_BDI_INIT) |
|---|
| 65 | -- |
|---|
| 66 | 1.7.3.4 |
|---|
| 67 | |
|---|
