staging: lustre: lustre: fix all bare unsigned usage

[karo-tx-linux.git] / drivers / staging / lustre / lustre / llite / namei.c

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index d583696e83788404e06cc795b438047815d80267..a208a8b02c2cdd8295c27a32fa5baec374542354 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -86,7 +86,7 @@ static int ll_set_inode(struct inode *inode, void *opaque)
 
        inode->i_mode = (inode->i_mode & ~S_IFMT) | (body->mbo_mode & S_IFMT);
        if (unlikely(inode->i_mode == 0)) {
-               CERROR("Invalid inode "DFID" type\n", PFID(&lli->lli_fid));
+               CERROR("Invalid inode " DFID " type\n", PFID(&lli->lli_fid));
                return -EINVAL;
        }
 
@@ -134,7 +134,7 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash,
                }
        } else if (!(inode->i_state & (I_FREEING | I_CLEAR))) {
                rc = ll_update_inode(inode, md);
-               CDEBUG(D_VFSTRACE, "got inode: "DFID"(%p): rc = %d\n",
+               CDEBUG(D_VFSTRACE, "got inode: " DFID "(%p): rc = %d\n",
                       PFID(&md->body->mbo_fid1), inode, rc);
                if (rc) {
                        if (S_ISDIR(inode->i_mode))
@@ -205,7 +205,7 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 
                if (!fid_res_name_eq(ll_inode2fid(inode),
                                     &lock->l_resource->lr_name)) {
-                       LDLM_ERROR(lock, "data mismatch with object "DFID"(%p)",
+                       LDLM_ERROR(lock, "data mismatch with object " DFID "(%p)",
                                   PFID(ll_inode2fid(inode)), inode);
                        LBUG();
                }
@@ -257,7 +257,7 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                        rc = ll_layout_conf(inode, &conf);
                        if (rc < 0)
                                CDEBUG(D_INODE, "cannot invalidate layout of "
-                                      DFID": rc = %d\n",
+                                      DFID ": rc = %d\n",
                                       PFID(ll_inode2fid(inode)), rc);
                }
 
@@ -274,7 +274,7 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                if ((bits & MDS_INODELOCK_UPDATE) && S_ISDIR(inode->i_mode)) {
                        struct ll_inode_info *lli = ll_i2info(inode);
 
-                       CDEBUG(D_INODE, "invalidating inode "DFID" lli = %p, pfid  = "DFID"\n",
+                       CDEBUG(D_INODE, "invalidating inode " DFID " lli = %p, pfid  = " DFID "\n",
                               PFID(ll_inode2fid(inode)), lli,
                               PFID(&lli->lli_pfid));
 
@@ -290,7 +290,7 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                                 * we have to invalidate the negative children
                                 * on master inode
                                 */
-                               CDEBUG(D_INODE, "Invalidate s"DFID" m"DFID"\n",
+                               CDEBUG(D_INODE, "Invalidate s" DFID " m" DFID "\n",
                                       PFID(ll_inode2fid(inode)),
                                       PFID(&lli->lli_pfid));
 
@@ -542,7 +542,7 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
        if (dentry->d_name.len > ll_i2sbi(parent)->ll_namelen)
                return ERR_PTR(-ENAMETOOLONG);
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p),intent=%s\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p),intent=%s\n",
               dentry, PFID(ll_inode2fid(parent)), parent, LL_IT2STR(it));
 
        if (d_mountpoint(dentry))
@@ -650,7 +650,7 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry,
        struct lookup_intent *itp, it = { .it_op = IT_GETATTR };
        struct dentry *de;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p),flags=%u\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p),flags=%u\n",
               dentry, PFID(ll_inode2fid(parent)), parent, flags);
 
        /* Optimize away (CREATE && !OPEN). Let .create handle the race.
@@ -678,14 +678,14 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry,
  * together.
  */
 static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
-                         struct file *file, unsigned open_flags,
+                         struct file *file, unsigned int open_flags,
                          umode_t mode, int *opened)
 {
        struct lookup_intent *it;
        struct dentry *de;
        int rc = 0;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p),file %p,open_flags %x,mode %x opened %d\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p),file %p,open_flags %x,mode %x opened %d\n",
               dentry, PFID(ll_inode2fid(dir)), dir, file, open_flags, mode,
               *opened);
 
@@ -792,7 +792,7 @@ static struct inode *ll_create_node(struct inode *dir, struct lookup_intent *it)
         * lock on the inode.  Since we finally have an inode pointer,
         * stuff it in the lock.
         */
-       CDEBUG(D_DLMTRACE, "setting l_ast_data to inode "DFID"(%p)\n",
+       CDEBUG(D_DLMTRACE, "setting l_ast_data to inode " DFID "(%p)\n",
               PFID(ll_inode2fid(dir)), inode);
        ll_set_lock_data(sbi->ll_md_exp, inode, it, NULL);
  out:
@@ -820,7 +820,7 @@ static int ll_create_it(struct inode *dir, struct dentry *dentry,
        struct inode *inode;
        int rc = 0;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p), intent=%s\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p), intent=%s\n",
               dentry, PFID(ll_inode2fid(dir)), dir, LL_IT2STR(it));
 
        rc = it_open_error(DISP_OPEN_CREATE, it);
@@ -844,7 +844,7 @@ void ll_update_times(struct ptlrpc_request *request, struct inode *inode)
        LASSERT(body);
        if (body->mbo_valid & OBD_MD_FLMTIME &&
            body->mbo_mtime > LTIME_S(inode->i_mtime)) {
-               CDEBUG(D_INODE, "setting fid "DFID" mtime from %lu to %llu\n",
+               CDEBUG(D_INODE, "setting fid " DFID " mtime from %lu to %llu\n",
                       PFID(ll_inode2fid(inode)), LTIME_S(inode->i_mtime),
                       body->mbo_mtime);
                LTIME_S(inode->i_mtime) = body->mbo_mtime;
@@ -942,7 +942,7 @@ static int ll_mknod(struct inode *dir, struct dentry *dchild,
 {
        int err;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p) mode %o dev %x\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p) mode %o dev %x\n",
               dchild, PFID(ll_inode2fid(dir)), dir, mode,
               old_encode_dev(rdev));
 
@@ -982,7 +982,7 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry,
 {
        int rc;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p), flags=%u, excl=%d\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p), flags=%u, excl=%d\n",
               dentry, PFID(ll_inode2fid(dir)), dir, mode, want_excl);
 
        rc = ll_mknod(dir, dentry, mode, 0);
@@ -1032,7 +1032,7 @@ static int ll_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 {
        int err;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir"DFID"(%p)\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir" DFID "(%p)\n",
               dentry, PFID(ll_inode2fid(dir)), dir);
 
        if (!IS_POSIXACL(dir) || !exp_connect_umask(ll_i2mdexp(dir)))
@@ -1052,7 +1052,7 @@ static int ll_rmdir(struct inode *dir, struct dentry *dchild)
        struct md_op_data *op_data;
        int rc;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p)\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p)\n",
               dchild, PFID(ll_inode2fid(dir)), dir);
 
        op_data = ll_prep_md_op_data(NULL, dir, NULL,
@@ -1082,7 +1082,7 @@ static int ll_symlink(struct inode *dir, struct dentry *dentry,
 {
        int err;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir="DFID"(%p),target=%.*s\n",
+       CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, dir=" DFID "(%p),target=%.*s\n",
               dentry, PFID(ll_inode2fid(dir)), dir, 3000, oldname);
 
        err = ll_new_node(dir, dentry, oldname, S_IFLNK | 0777,
@@ -1103,7 +1103,7 @@ static int ll_link(struct dentry *old_dentry, struct inode *dir,
        struct md_op_data *op_data;
        int err;
 
-       CDEBUG(D_VFSTRACE, "VFS Op: inode="DFID"(%p), dir="DFID"(%p), target=%pd\n",
+       CDEBUG(D_VFSTRACE, "VFS Op: inode=" DFID "(%p), dir=" DFID "(%p), target=%pd\n",
               PFID(ll_inode2fid(src)), src, PFID(ll_inode2fid(dir)), dir,
               new_dentry);
 
@@ -1138,7 +1138,7 @@ static int ll_rename(struct inode *src, struct dentry *src_dchild,
                return -EINVAL;
 
        CDEBUG(D_VFSTRACE,
-              "VFS Op:oldname=%pd, src_dir="DFID"(%p), newname=%pd, tgt_dir="DFID"(%p)\n",
+              "VFS Op:oldname=%pd, src_dir=" DFID "(%p), newname=%pd, tgt_dir=" DFID "(%p)\n",
               src_dchild, PFID(ll_inode2fid(src)), src,
               tgt_dchild, PFID(ll_inode2fid(tgt)), tgt);