From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Jun 2009 16:13:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke... 
X-Git-Tag: v2.6.31-rc1~333
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c7cb99a8202452d3e0440a5505c5c6d262771d9;p=pandora-kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/ryusuke/nilfs2

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (22 commits)
  nilfs2: support contiguous lookup of blocks
  nilfs2: add sync_page method to page caches of meta data
  nilfs2: use device's backing_dev_info for btree node caches
  nilfs2: return EBUSY against delete request on snapshot
  nilfs2: modify list of unsupported features in caveats
  nilfs2: enable sync_page method
  nilfs2: set bio unplug flag for the last bio in segment
  nilfs2: allow future expansion of metadata read out via get info ioctl
  NILFS2: Pagecache usage optimization on NILFS2
  nilfs2: remove nilfs_btree_operations from btree mapping
  nilfs2: remove nilfs_direct_operations from direct mapping
  nilfs2: remove bmap pointer operations
  nilfs2: remove useless b_low and b_high fields from nilfs_bmap struct
  nilfs2: remove pointless NULL check of bpop_commit_alloc_ptr function
  nilfs2: move get block functions in bmap.c into btree codes
  nilfs2: remove nilfs_bmap_delete_block
  nilfs2: remove nilfs_bmap_put_block
  nilfs2: remove header file for segment list operations
  nilfs2: eliminate removal list of segments
  nilfs2: add sufile function that can modify multiple segment usages
  ...
---

9c7cb99a8202452d3e0440a5505c5c6d262771d9
diff --cc fs/nilfs2/the_nilfs.c
index e4e5c78bcc93,dfe2e320276e..8b8889825716
--- a/fs/nilfs2/the_nilfs.c
+++ b/fs/nilfs2/the_nilfs.c
@@@ -32,13 -32,8 +32,12 @@@
  #include "cpfile.h"
  #include "sufile.h"
  #include "dat.h"
- #include "seglist.h"
  #include "segbuf.h"
  
 +
 +static LIST_HEAD(nilfs_objects);
 +static DEFINE_SPINLOCK(nilfs_lock);
 +
  void nilfs_set_last_segment(struct the_nilfs *nilfs,
  			    sector_t start_blocknr, u64 seq, __u64 cno)
  {