Hi Andrew, please consider applying the following changes to -mm tree. Ryusuke Konishi (3): nilfs2: fix lockdep warnings in page operations for btree nodes nilfs2: fix lockdep warnings during disk space reclamation nilfs2: get rid of nilfs_mapping_init() The first two are to resolve the lockdep warning issue, and the last one is the accompanying cleanup and low priority. The merge window is already open, but this is for the reported issues, so I'll send it without waiting at this point when tests have passed. Based on your comment, this series solves the issue by separating inode object as needed. Since I was worried about the impact of the object composition changes, I tested the series carefully not to cause regressions especially for delicate functions such like disk space reclamation and snapshots. Thanks, Ryusuke Konishi -- fs/nilfs2/btnode.c | 23 +++++++- fs/nilfs2/btnode.h | 1 + fs/nilfs2/btree.c | 27 ++++++--- fs/nilfs2/dat.c | 4 +- fs/nilfs2/gcinode.c | 7 ++- fs/nilfs2/inode.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++----- fs/nilfs2/mdt.c | 43 +++++++++----- fs/nilfs2/mdt.h | 6 +- fs/nilfs2/nilfs.h | 16 +++--- fs/nilfs2/page.c | 16 +----- fs/nilfs2/page.h | 1 - fs/nilfs2/segment.c | 9 ++- fs/nilfs2/super.c | 5 +- 13 files changed, 241 insertions(+), 76 deletions(-) -- 1.8.3.1
