aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2008-02-04 20:13:53 -0500
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-02-07 02:23:38 -0500
commit4188c78d951d8a44630f4c33bc0f5b63374572a4 (patch)
treef550ffdc10f87cd6fe553fc3fd9093dba04d1c57 /fs
parent222096ae7f7616caa9e4150948096160cc8a8141 (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')
-rw-r--r--fs/xfs/linux-2.6/xfs_iops.c1
-rw-r--r--fs/xfs/linux-2.6/xfs_vnode.c1
-rw-r--r--fs/xfs/xfs_utils.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 5e16016bf657..cc4abd3daa49 100644
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -201,7 +201,6 @@ xfs_validate_fields(
201 struct xfs_inode *ip = XFS_I(inode); 201 struct xfs_inode *ip = XFS_I(inode);
202 loff_t size; 202 loff_t size;
203 203
204 inode->i_nlink = ip->i_d.di_nlink;
205 /* we're under i_sem so i_size can't change under us */ 204 /* we're under i_sem so i_size can't change under us */
206 size = XFS_ISIZE(ip); 205 size = XFS_ISIZE(ip);
207 if (i_size_read(inode) != size) 206 if (i_size_read(inode) != size)
diff --git a/fs/xfs/linux-2.6/xfs_vnode.c b/fs/xfs/linux-2.6/xfs_vnode.c
index 9bf36dc48a6e..44a48ef90073 100644
--- a/fs/xfs/linux-2.6/xfs_vnode.c
+++ b/fs/xfs/linux-2.6/xfs_vnode.c
@@ -103,7 +103,6 @@ vn_revalidate(
103 103
104 xfs_ilock(ip, XFS_ILOCK_SHARED); 104 xfs_ilock(ip, XFS_ILOCK_SHARED);
105 inode->i_mode = ip->i_d.di_mode; 105 inode->i_mode = ip->i_d.di_mode;
106 inode->i_nlink = ip->i_d.di_nlink;
107 inode->i_uid = ip->i_d.di_uid; 106 inode->i_uid = ip->i_d.di_uid;
108 inode->i_gid = ip->i_d.di_gid; 107 inode->i_gid = ip->i_d.di_gid;
109 inode->i_mtime.tv_sec = ip->i_d.di_mtime.t_sec; 108 inode->i_mtime.tv_sec = ip->i_d.di_mtime.t_sec;
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 /*