[linux-cifs-client] fixed cifs_rename patch + updated pull request

Jeff Layton jlayton at redhat.com
Mon Oct 20 13:09:57 GMT 2008


Ok, I think I have most of the concerns about the cifs_rename patch
straightened out, and have pushed a new patch to my git tree for it. It
does still throw one checkpatch warning:

WARNING: suspect code indent for conditional statements
#158: FILE: fs/cifs/inode.c:1375:
+	if (rc == -EACCES || rc == -EEXIST) {

total: 0 errors, 1 warnings, 210 lines checked

./03-cifs-make-cifs_rename-handle-e.patch has style problems,
please review.  If any of these errors are false positives report
them to the maintainer, see CHECKPATCH in MAINTAINERS.

...but according to this, that seems to be a false alarm:

    http://bugzilla.kernel.org/show_bug.cgi?id=11285

...also, it looks like you altered one of the patches I sent:

                /* although we would like to mark the file hidden
                   if that fails we will still try to rename it */
                if (rc != 0) {
                        cifsInode->cifsAttrs = dosattr;
                else
                        dosattr = origattr; /* since not able to change them */

...there's an unbalanced curly brace here (a patch to fix it is in my
tree). The big concern here isn't so much setting ATTR_HIDDEN, but
rather making sure that we clear ATTR_READONLY. Windows doesn't seem to
allow renaming readonly files. Still, I suppose it doesn't hurt to try
renaming here if the setattr fails.

New pull request follows:

------------------[snip]----------------

The following changes since commit 3270958b717a13d0228803254609c19184854b9b:
  Steve French (1):
        [CIFS] undo changes in cifs_rename_pending_delete if it errors out

are available in the git repository at:

  git://git.samba.org/jlayton/cifs.git cifs-next

Jeff Layton (7):
      cifs: fixed unbalanced brace in cifs_rename_pending_delete
      cifs: no need to use rcu_assign_pointer on immutable keys
      cifs: make cifs_rename handle -EACCES errors
      cifs: remove unused SMB session pointer from struct mid_q_entry
      cifs: clean up server protocol handling for TCP_Server_Info
      cifs: handle the TCP_Server_Info->tsk field more carefully
      cifs: disable sharing session and tcon and add new TCP sharing code

 fs/cifs/cifs_debug.c  |    2 +-
 fs/cifs/cifs_spnego.c |    2 +-
 fs/cifs/cifsfs.c      |    8 ++
 fs/cifs/cifsglob.h    |   14 +--
 fs/cifs/cifsproto.h   |    1 +
 fs/cifs/cifssmb.c     |   14 +--
 fs/cifs/connect.c     |  230 +++++++++++++++++++------------------------------
 fs/cifs/dns_resolve.c |    2 +-
 fs/cifs/inode.c       |  176 ++++++++++++++++++++++++++-----------
 fs/cifs/transport.c   |   13 +--
 10 files changed, 236 insertions(+), 226 deletions(-)

-- 
Jeff Layton <jlayton at redhat.com>


More information about the linux-cifs-client mailing list