diff options
| author | Alex Elder <aelder@sgi.com> | 2011-01-10 21:35:55 -0600 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-01-10 21:35:55 -0600 |
| commit | 92f1c008ae79e32b83c0607d184b194f302bb3ee (patch) | |
| tree | 070980c581ca39a050a1b86a50fe4c52437cdba1 /fs/xfs/linux-2.6/xfs_linux.h | |
| parent | e54be894eae10eca9892e965cc9532f5d5a11767 (diff) | |
| parent | d0eb2f38b250b7d6c993adf81b0e4ded0565497e (diff) | |
Merge branch 'master' into for-linus-merged
This merge pulls the XFS master branch into the latest Linus master.
This results in a merge conflict whose best fix is not obvious.
I manually fixed the conflict, in "fs/xfs/xfs_iget.c".
Dave Chinner had done work that resulted in RCU freeing of inodes
separate from what Nick Piggin had done, and their results differed
slightly in xfs_inode_free(). The fix updates Nick's call_rcu()
with the use of VFS_I(), while incorporating needed updates to some
XFS inode fields implemented in Dave's series. Dave's RCU callback
function has also been removed.
Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_linux.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index 214ddd71ff79..096494997747 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h @@ -37,7 +37,6 @@ #include <kmem.h> #include <mrlock.h> -#include <sv.h> #include <time.h> #include <support/debug.h> |