diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 17:52:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 17:52:39 -0700 |
| commit | 6e66d5dab5d530a368314eb631201a02aabb075d (patch) | |
| tree | 9a815cd1951ccc75600974eddab952c51687e79a /fs/cifs/cifssmb.c | |
| parent | 25bfe4f5f138e07272f98615c305b6f7e56389e2 (diff) | |
| parent | 1f80c0cc39e587edd06a36b43ba3a3b09d4ac428 (diff) | |
| download | linux-6e66d5dab5d530a368314eb631201a02aabb075d.tar.bz2 | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"A set of 5 small cifs fixes"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cif: fix dead code
cifs: fix error handling cifs_user_readv
fs: cifs: remove unused variable.
Return correct error on query of xattr on file with empty xattrs
cifs: Wait for writebacks to complete before attempting write.
Diffstat (limited to 'fs/cifs/cifssmb.c')
| -rw-r--r-- | fs/cifs/cifssmb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index f3264bd7a83d..6ce4e0954b98 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -6197,6 +6197,9 @@ QAllEAsRetry: cifs_dbg(FYI, "ea length %d\n", list_len); if (list_len <= 8) { cifs_dbg(FYI, "empty EA list returned from server\n"); + /* didn't find the named attribute */ + if (ea_name) + rc = -ENODATA; goto QAllEAsOut; } |