diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
| commit | 94bc2be31a01a3055ec94176e595dfe208e92d3b (patch) | |
| tree | ebfbe81c6718a6390bfa1b99c6d228237d818576 /fs/pnode.c | |
| parent | c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 (diff) | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/pnode.c')
| -rw-r--r-- | fs/pnode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index aeeec8ba8dd2..f1871f773f64 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
| @@ -103,7 +103,7 @@ static struct vfsmount *propagation_next(struct vfsmount *m, | |||
| 103 | struct vfsmount *next; | 103 | struct vfsmount *next; |
| 104 | struct vfsmount *master = m->mnt_master; | 104 | struct vfsmount *master = m->mnt_master; |
| 105 | 105 | ||
| 106 | if ( master == origin->mnt_master ) { | 106 | if (master == origin->mnt_master) { |
| 107 | next = next_peer(m); | 107 | next = next_peer(m); |
| 108 | return ((next == origin) ? NULL : next); | 108 | return ((next == origin) ? NULL : next); |
| 109 | } else if (m->mnt_slave.next != &master->mnt_slave_list) | 109 | } else if (m->mnt_slave.next != &master->mnt_slave_list) |