From c12c7dd57b5c5a74bd7c4e41c27401170b4c715c Mon Sep 17 00:00:00 2001 From: pschwan Date: Mon, 22 Apr 2002 22:56:24 +0000 Subject: [PATCH] - Untested changes to the FS use of the DLM: - if we already have a lock that covers the extent, use it - if we need a PR lock and already have a PW lock, use the PW lock - if we can promote a PR lock to a PW lock and be covered, do the conversion - keep track of the readers and writers using the lock - fixed a lock conversion bug (we were ignoring locks held by other members of the conversion list when checking for granted compat) - Brought today's changes onto the branch Next up: fixing the dlm locking mess. --- lustre/obdfs/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/obdfs/file.c b/lustre/obdfs/file.c index b1bd823..45493d2 100644 --- a/lustre/obdfs/file.c +++ b/lustre/obdfs/file.c @@ -65,11 +65,11 @@ static ssize_t obdfs_file_write(struct file *file, const char *buf, size_t count, loff_t *ppos) { ssize_t retval; - CDEBUG(D_INFO, "Writing inode %ld, %d bytes, offset %Ld\n", - file->f_dentry->d_inode->i_ino, count, *ppos); + CDEBUG(D_INFO, "Writing inode %ld, %ld bytes, offset %Ld\n", + file->f_dentry->d_inode->i_ino, (long)count, *ppos); retval = generic_file_write(file, buf, count, ppos); - CDEBUG(D_INFO, "Wrote %d\n", retval); + CDEBUG(D_INFO, "Wrote %ld\n", (long)retval); /* update mtime/ctime/atime here, NOT size */ if (retval > 0) { -- 1.8.3.1