Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
Two bugfixes in XFS for 3.3: one fix passes KMEM_SLEEP to kmem_realloc instead of 0, and the other resolves a possible deadlock in xfs quotas. * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: use a normal shrinker for the dquot freelist xfs: pass KM_SLEEP flag to kmem_realloc() in xlog_recover_add_to_cnt_trans()
Showing
- fs/xfs/kmem.h 0 additions, 6 deletionsfs/xfs/kmem.h
- fs/xfs/xfs_dquot.c 26 additions, 77 deletionsfs/xfs/xfs_dquot.c
- fs/xfs/xfs_log_recover.c 1 addition, 1 deletionfs/xfs/xfs_log_recover.c
- fs/xfs/xfs_qm.c 111 additions, 180 deletionsfs/xfs/xfs_qm.c
- fs/xfs/xfs_qm.h 0 additions, 14 deletionsfs/xfs/xfs_qm.h
- fs/xfs/xfs_qm_stats.c 2 additions, 2 deletionsfs/xfs/xfs_qm_stats.c
- fs/xfs/xfs_trace.h 2 additions, 3 deletionsfs/xfs/xfs_trace.h
Please register or sign in to comment