diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-05-13 18:19:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-05-13 18:19:32 -0400 |
| commit | baa456331738b4e76a92318b62b354377a30ad80 (patch) | |
| tree | 75c828a7c8a9f1b5f7f41b2e53271eafb7e561ef /fs/xfs/xfs_mount.h | |
| parent | aa3e5572c538d753dce11bf93532a75f95d22b40 (diff) | |
| parent | 4462dc02842698f173f518c1f5ce79c0fb89395a (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/inode.c
Diffstat (limited to 'fs/xfs/xfs_mount.h')
| -rw-r--r-- | fs/xfs/xfs_mount.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 4fa0bc7b983e..9ff48a16a7ee 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
| @@ -259,6 +259,7 @@ typedef struct xfs_mount { | |||
| 259 | wait_queue_head_t m_wait_single_sync_task; | 259 | wait_queue_head_t m_wait_single_sync_task; |
| 260 | __int64_t m_update_flags; /* sb flags we need to update | 260 | __int64_t m_update_flags; /* sb flags we need to update |
| 261 | on the next remount,rw */ | 261 | on the next remount,rw */ |
| 262 | struct list_head m_mplist; /* inode shrinker mount list */ | ||
| 262 | } xfs_mount_t; | 263 | } xfs_mount_t; |
| 263 | 264 | ||
| 264 | /* | 265 | /* |