diff options
author | Christoph Hellwig <hch@infradead.org> | 2008-02-04 20:13:53 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-07 02:23:38 -0500 |
commit | 4188c78d951d8a44630f4c33bc0f5b63374572a4 (patch) | |
tree | f550ffdc10f87cd6fe553fc3fd9093dba04d1c57 /fs/xfs/xfs_utils.c | |
parent | 222096ae7f7616caa9e4150948096160cc8a8141 (diff) |
[XFS] keep i_nlink updated and use proper accessors
To get the read-only bind mounts in -mm to work correctly with XFS we need
to call the drop_nlink and inc_nlink helpers to monitor the link count.
Add calls to these to xfs_bumplink and xfs_droplink and stop copying over
di_nlink to i_nlink in xfs_validate_fields and vn_revalidate.
SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30392a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_utils.c')
-rw-r--r-- | fs/xfs/xfs_utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c index 4df466fa3a40..45d740df53b7 100644 --- a/fs/xfs/xfs_utils.c +++ b/fs/xfs/xfs_utils.c | |||
@@ -302,6 +302,7 @@ xfs_droplink( | |||
302 | 302 | ||
303 | ASSERT (ip->i_d.di_nlink > 0); | 303 | ASSERT (ip->i_d.di_nlink > 0); |
304 | ip->i_d.di_nlink--; | 304 | ip->i_d.di_nlink--; |
305 | drop_nlink(ip->i_vnode); | ||
305 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); | 306 | xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); |
306 | 307 | ||
307 | error = 0; | 308 | error = 0; |
@@ -365,6 +366,7 @@ xfs_bumplink( | |||
365 | 366 | ||
366 | ASSERT(ip->i_d.di_nlink > 0); | 367 | ASSERT(ip->i_d.di_nlink > 0); |
367 | ip->i_d.di_nlink++; | 368 | ip->i_d.di_nlink++; |
369 | inc_nlink(ip->i_vnode); | ||
368 | if ((ip->i_d.di_version == XFS_DINODE_VERSION_1) && | 370 | if ((ip->i_d.di_version == XFS_DINODE_VERSION_1) && |
369 | (ip->i_d.di_nlink > XFS_MAXLINK_1)) { | 371 | (ip->i_d.di_nlink > XFS_MAXLINK_1)) { |
370 | /* | 372 | /* |