patch-2.1.55 linux/fs/nfsd/vfs.c

Next file: linux/fs/pipe.c
Previous file: linux/fs/nfs/dir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.54/linux/fs/nfsd/vfs.c linux/fs/nfsd/vfs.c
@@ -476,7 +476,7 @@
 #endif
 		}
 
-		if (test_bit(I_DIRTY, &inode->i_state)) {
+		if (inode->i_state & I_DIRTY) {
 			dprintk("nfsd: write sync %d\n", current->pid);
 			nfsd_sync(inode, &file);
 			write_inode_now(inode);
@@ -928,8 +928,7 @@
 			file.f_inode->i_dev, file.f_inode->i_ino,
 			(int) file.f_pos, (int) oldlen, (int) cd.buflen);
 		 */
-		err = file.f_op->readdir(inode, &file,
-					 &cd, (filldir_t) func);
+		err = file.f_op->readdir(&file, &cd, (filldir_t) func);
 
 		if (err < 0) {
 			nfsd_close(&file);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov