diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /fs/xfs/linux-2.6/xfs_vnode.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_vnode.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c index 553fa731ade5..ada24baf88de 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.c +++ b/fs/xfs/linux-2.6/xfs_vnode.c | |||
| @@ -26,7 +26,7 @@ DEFINE_SPINLOCK(vnumber_lock); | |||
| 26 | */ | 26 | */ |
| 27 | #define NVSYNC 37 | 27 | #define NVSYNC 37 |
| 28 | #define vptosync(v) (&vsync[((unsigned long)v) % NVSYNC]) | 28 | #define vptosync(v) (&vsync[((unsigned long)v) % NVSYNC]) |
| 29 | STATIC wait_queue_head_t vsync[NVSYNC]; | 29 | static wait_queue_head_t vsync[NVSYNC]; |
| 30 | 30 | ||
| 31 | void | 31 | void |
| 32 | vn_init(void) | 32 | vn_init(void) |