Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  Wrap buffers used for rpc debug printks into RPC_IFDEBUG
  nfs: fix sparse warnings
  NFS: flush signals before taking down callback thread

7 files changed, 10 insertions, 9 deletions

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 08226464e563..1ed8bd4de941 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -153,7 +153,7 @@ lockd(struct svc_rqst *rqstp)
          */
         while ((nlmsvc_users || !signalled()) && nlmsvc_pid == current->pid) {
                 long timeout = MAX_SCHEDULE_TIMEOUT;
-                char buf[RPC_MAX_ADDRBUFLEN];
+                RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
 
                 if (signalled()) {
                         flush_signals(current);
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index ecc06c619494..66648dd92d97 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -93,6 +93,7 @@ static void nfs_callback_svc(struct svc_rqst *rqstp)
                 svc_process(rqstp);
         }
 
+        flush_signals(current);
         svc_exit_thread(rqstp);
         nfs_callback_info.pid = 0;
         complete(&nfs_callback_info.stopped);
@@ -171,7 +172,7 @@ void nfs_callback_down(void)
 static int nfs_callback_authenticate(struct svc_rqst *rqstp)
 {
         struct nfs_client *clp;
-        char buf[RPC_MAX_ADDRBUFLEN];
+        RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
 
         /* Don't talk to strangers */
         clp = nfs_find_client(svc_addr(rqstp), 4);
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index c63eb720b68b..13619d24f023 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -254,7 +254,7 @@ static __be32 encode_attr_change(struct xdr_stream *xdr, const uint32_t *bitmap,
         if (!(bitmap[0] & FATTR4_WORD0_CHANGE))
                 return 0;
         p = xdr_reserve_space(xdr, 8);
-        if (unlikely(p == 0))
+        if (unlikely(!p))
                 return htonl(NFS4ERR_RESOURCE);
         p = xdr_encode_hyper(p, change);
         return 0;
@@ -267,7 +267,7 @@ static __be32 encode_attr_size(struct xdr_stream *xdr, const uint32_t *bitmap, u
         if (!(bitmap[0] & FATTR4_WORD0_SIZE))
                 return 0;
         p = xdr_reserve_space(xdr, 8);
-        if (unlikely(p == 0))
+        if (unlikely(!p))
                 return htonl(NFS4ERR_RESOURCE);
         p = xdr_encode_hyper(p, size);
         return 0;
@@ -278,7 +278,7 @@ static __be32 encode_attr_time(struct xdr_stream *xdr, const struct timespec *ti
         __be32 *p;
 
         p = xdr_reserve_space(xdr, 12);
-        if (unlikely(p == 0))
+        if (unlikely(!p))
                 return htonl(NFS4ERR_RESOURCE);
         p = xdr_encode_hyper(p, time->tv_sec);
         *p = htonl(time->tv_nsec);
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index b9eadd18ba70..00a5e4405e16 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -49,7 +49,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_
         struct file_lock *fl;
         int status;
 
-        for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) {
+        for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
                 if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK)))
                         continue;
                 if (nfs_file_open_context(fl->fl_file) != ctx)
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index 8ae5dba2d4e5..86147b0ab2cf 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -309,7 +309,7 @@ nfs_idmap_name(struct idmap *idmap, struct idmap_hashtable *h,
         mutex_lock(&idmap->idmap_im_lock);
 
         he = idmap_lookup_id(h, id);
-        if (he != 0) {
+        if (he) {
                 memcpy(name, he->ih_name, he->ih_namelen);
                 ret = he->ih_namelen;
                 goto out;
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 6233eb5e98c1..b962397004c1 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -785,7 +785,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_s
         struct file_lock *fl;
         int status = 0;
 
-        for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) {
+        for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
                 if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK)))
                         continue;
                 if (nfs_file_open_context(fl->fl_file)->state != state)
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 0130b345234d..1eb771d79cca 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -101,7 +101,7 @@ static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp,
 {
         /* Check if the request originated from a secure port. */
         if (!rqstp->rq_secure && EX_SECURE(exp)) {
-                char buf[RPC_MAX_ADDRBUFLEN];
+                RPC_IFDEBUG(char buf[RPC_MAX_ADDRBUFLEN]);
                 dprintk(KERN_WARNING
                        "nfsd: request from insecure port %s!\n",
                        svc_print_addr(rqstp, buf, sizeof(buf)));