[PVFS2-CVS] commit by neill in pvfs2-1/src/kernel/linux-2.6: dir.c namei.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6
In directory parlweb:/tmp/cvs-serv13915

Modified Files:
	dir.c namei.c 
Log Message:
- more link count adjustments


Index: dir.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/dir.c,v
diff -p -u -r1.14 -r1.15
--- dir.c	30 Jan 2004 22:43:14 -0000	1.14
+++ dir.c	6 Feb 2004 20:02:20 -0000	1.15
@@ -46,7 +46,6 @@ static int pvfs2_readdir(
     pvfs2_kernel_op_t *new_op = NULL;
     pvfs2_inode_t *pvfs2_inode = PVFS2_I(dentry->d_inode);
 
-    /* pick up from where we left off */
     pos = (PVFS_ds_position)file->f_pos;
 
     pvfs2_print("pvfs2: pvfs2_readdir called on %s (pos = %d)\n",
@@ -155,7 +154,6 @@ static int pvfs2_readdir(
         }
 
       error_exit:
-	/* when request is serviced properly, free req op struct */
 	op_release(new_op);
 	break;
     }

Index: namei.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/namei.c,v
diff -p -u -r1.39 -r1.40
--- namei.c	6 Feb 2004 16:08:32 -0000	1.39
+++ namei.c	6 Feb 2004 20:02:20 -0000	1.40
@@ -205,6 +205,7 @@ static int pvfs2_unlink(
     ret = pvfs2_remove_entry(dir, dentry);
     if (ret == 0)
     {
+        inode->i_nlink--;
         inode->i_ctime = dir->i_ctime;
     }
     return ret;
@@ -263,6 +264,8 @@ static int pvfs2_rmdir(
 {
     int ret = -ENOTEMPTY;
     struct inode *inode = dentry->d_inode;
+
+    dentry->d_inode->i_nlink--;
 
     ret = pvfs2_unlink(dir, dentry);
     if (ret == 0)