remove directory incorrectly tries to set delete on close on non-empty directories

Browse source

commit 897fba1172 upstream.

Wrong return code was being returned on SMB3 rmdir of
non-empty directory.

For SMB3 (unlike for cifs), we attempt to delete a directory by
set of delete on close flag on the open. Windows clients set
this flag via a set info (SET_FILE_DISPOSITION to set this flag)
which properly checks if the directory is empty.

With this patch on smb3 mounts we correctly return
 "DIRECTORY NOT EMPTY"
on attempts to remove a non-empty directory.

Signed-off-by: Steve French <steve.french@primarydata.com>
Acked-by: Sachin Prabhu <sprabhu@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Steve French 2016-05-12 21:20:36 -05:00 • committed by Greg Kroah-Hartman

parent 6ff3df2010

commit b7d7ba3115

4 changed files with 25 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

fs/cifs/smb2glob.h

View file

8

fs/cifs/smb2inode.c

View file

16

fs/cifs/smb2pdu.c

View file

2

fs/cifs/smb2proto.h

View file