Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[linux.git] / fs / ceph / locks.c

diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c
index 9e66f69ee8a5ecc9e8455465f232bf70529e59a8..9dae2ec7e1fa89705f649b1c3349520b8bb23543 100644 (file)
--- a/fs/ceph/locks.c
+++ b/fs/ceph/locks.c
@@ -95,7 +95,7 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct inode *inode,
        owner = secure_addr(fl->fl_owner);
 
        dout("ceph_lock_message: rule: %d, op: %d, owner: %llx, pid: %llu, "
-            "start: %llu, length: %llu, wait: %d, type: %d", (int)lock_type,
+            "start: %llu, length: %llu, wait: %d, type: %d\n", (int)lock_type,
             (int)operation, owner, (u64)fl->fl_pid, fl->fl_start, length,
             wait, fl->fl_type);
 
@@ -132,7 +132,7 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct inode *inode,
        }
        ceph_mdsc_put_request(req);
        dout("ceph_lock_message: rule: %d, op: %d, pid: %llu, start: %llu, "
-            "length: %llu, wait: %d, type: %d, err code %d", (int)lock_type,
+            "length: %llu, wait: %d, type: %d, err code %d\n", (int)lock_type,
             (int)operation, (u64)fl->fl_pid, fl->fl_start,
             length, wait, fl->fl_type, err);
        return err;
@@ -226,7 +226,7 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl)
        if (__mandatory_lock(file->f_mapping->host) && fl->fl_type != F_UNLCK)
                return -ENOLCK;
 
-       dout("ceph_lock, fl_owner: %p", fl->fl_owner);
+       dout("ceph_lock, fl_owner: %p\n", fl->fl_owner);
 
        /* set wait bit as appropriate, then make command as Ceph expects it*/
        if (IS_GETLK(cmd))
@@ -264,7 +264,7 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl)
        err = ceph_lock_message(CEPH_LOCK_FCNTL, op, inode, lock_cmd, wait, fl);
        if (!err) {
                if (op == CEPH_MDS_OP_SETFILELOCK) {
-                       dout("mds locked, locking locally");
+                       dout("mds locked, locking locally\n");
                        err = posix_lock_file(file, fl, NULL);
                        if (err) {
                                /* undo! This should only happen if
@@ -272,7 +272,7 @@ int ceph_lock(struct file *file, int cmd, struct file_lock *fl)
                                 * deadlock. */
                                ceph_lock_message(CEPH_LOCK_FCNTL, op, inode,
                                                  CEPH_LOCK_UNLOCK, 0, fl);
-                               dout("got %d on posix_lock_file, undid lock",
+                               dout("got %d on posix_lock_file, undid lock\n",
                                     err);
                        }
                }
@@ -294,7 +294,7 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)
        if (fl->fl_type & LOCK_MAND)
                return -EOPNOTSUPP;
 
-       dout("ceph_flock, fl_file: %p", fl->fl_file);
+       dout("ceph_flock, fl_file: %p\n", fl->fl_file);
 
        spin_lock(&ci->i_ceph_lock);
        if (ci->i_ceph_flags & CEPH_I_ERROR_FILELOCK) {
@@ -329,7 +329,7 @@ int ceph_flock(struct file *file, int cmd, struct file_lock *fl)
                        ceph_lock_message(CEPH_LOCK_FLOCK,
                                          CEPH_MDS_OP_SETFILELOCK,
                                          inode, CEPH_LOCK_UNLOCK, 0, fl);
-                       dout("got %d on locks_lock_file_wait, undid lock", err);
+                       dout("got %d on locks_lock_file_wait, undid lock\n", err);
                }
        }
        return err;
@@ -356,7 +356,7 @@ void ceph_count_locks(struct inode *inode, int *fcntl_count, int *flock_count)
                        ++(*flock_count);
                spin_unlock(&ctx->flc_lock);
        }
-       dout("counted %d flock locks and %d fcntl locks",
+       dout("counted %d flock locks and %d fcntl locks\n",
             *flock_count, *fcntl_count);
 }
 
@@ -384,7 +384,7 @@ static int lock_to_ceph_filelock(struct file_lock *lock,
                cephlock->type = CEPH_LOCK_UNLOCK;
                break;
        default:
-               dout("Have unknown lock type %d", lock->fl_type);
+               dout("Have unknown lock type %d\n", lock->fl_type);
                err = -EINVAL;
        }
 
@@ -407,7 +407,7 @@ int ceph_encode_locks_to_buffer(struct inode *inode,
        int seen_flock = 0;
        int l = 0;
 
-       dout("encoding %d flock and %d fcntl locks", num_flock_locks,
+       dout("encoding %d flock and %d fcntl locks\n", num_flock_locks,
             num_fcntl_locks);
 
        if (!ctx)