projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 82094b55 AF |
1 | From: Tony Ernst <tee@sgi.com> |
| 2 | Subject: hide harmless xfs kabi changes to be compatible with the GA kernel | |
| 3 | ||
| 4 | In bug 482148, a KABI breakage was introduced into xfs. An SGI engineer | |
| 5 | approved this because it was internal to xfs, and he believed it wouldn't | |
| 6 | affect any of our other products. But the CRC checking doesn't work the way he | |
| 7 | thought it did. So we now have a problem where one of our add-ons gets a | |
| 8 | dependency error with the latest kernel update. | |
| 9 | ||
| 10 | So we've made a small patch that restores the old xfs CRC (same as SLES11 GA). | |
| 11 | We need to get this patch into the next SLES11 kernel update. I'll attach the | |
| 12 | patch. | |
| 13 | ||
| 14 | Acked-by: Michal Marek <mmarek@suse.cz> | |
| 15 | ||
| 16 | Index: linux-2.6.27.25-0.gwehrman/fs/xfs/quota/xfs_dquot.h | |
| 17 | =================================================================== | |
| 18 | --- linux-2.6.27.25-0.gwehrman.orig/fs/xfs/quota/xfs_dquot.h | |
| 19 | +++ linux-2.6.27.25-0.gwehrman/fs/xfs/quota/xfs_dquot.h | |
| 20 | @@ -83,8 +83,13 @@ typedef struct xfs_dquot { | |
| 21 | xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ | |
| 22 | mutex_t q_qlock; /* quota lock */ | |
| 23 | struct completion q_flush; /* flush completion queue */ | |
| 24 | +#ifdef __GENKSYMS__ | |
| 25 | + uint q_pincount; /* dquot pin count */ | |
| 26 | + sv_t q_pinwait; /* dquot pinning wait queue */ | |
| 27 | +#else | |
| 28 | atomic_t q_pincount; /* dquot pin count */ | |
| 29 | wait_queue_head_t q_pinwait; /* dquot pinning wait queue */ | |
| 30 | +#endif | |
| 31 | ||
| 32 | #ifdef XFS_DQUOT_TRACE | |
| 33 | struct ktrace *q_trace; /* trace header structure */ | |
| 34 | Index: linux-2.6.27.25-0.gwehrman/fs/xfs/quota/xfs_qm.h | |
| 35 | =================================================================== | |
| 36 | --- linux-2.6.27.25-0.gwehrman.orig/fs/xfs/quota/xfs_qm.h | |
| 37 | +++ linux-2.6.27.25-0.gwehrman/fs/xfs/quota/xfs_qm.h | |
| 38 | @@ -106,6 +106,9 @@ typedef struct xfs_qm { | |
| 39 | typedef struct xfs_quotainfo { | |
| 40 | xfs_inode_t *qi_uquotaip; /* user quota inode */ | |
| 41 | xfs_inode_t *qi_gquotaip; /* group quota inode */ | |
| 42 | +#ifdef __GENKSYMS__ | |
| 43 | + spinlock_t qi_pinlock; /* dquot pinning lock */ | |
| 44 | +#endif | |
| 45 | xfs_dqlist_t qi_dqlist; /* all dquots in filesys */ | |
| 46 | int qi_dqreclaims; /* a change here indicates | |
| 47 | a removal in the dqlist */ |