]> err.no Git - linux-2.6/commitdiff
[CIFS] Fix readdir breakage when blocksize set too small
authorSteve French <sfrench@us.ibm.com>
Mon, 30 Oct 2006 21:42:57 +0000 (21:42 +0000)
committerSteve French <sfrench@us.ibm.com>
Mon, 30 Oct 2006 21:42:57 +0000 (21:42 +0000)
Do not treat filldir running out of space as an error that needs
to be returned.

Fixes Redhat bugzilla bug # 211070

Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/readdir.c

index b5b0a2a41befe85734ffc30dc47f68f76bf05790..ed18c3965f7b5e7f49d43b6bb944a70ca6dca5bd 100644 (file)
@@ -896,6 +896,10 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
                     tmp_inode->i_ino,obj_type);
        if(rc) {
                cFYI(1,("filldir rc = %d",rc));
+               /* we can not return filldir errors to the caller
+               since they are "normal" when the stat blocksize
+               is too small - we return remapped error instead */
+               rc = -EOVERFLOW;
        }
 
        dput(tmp_dentry);
@@ -1074,6 +1078,11 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                        we want to check for that here? */
                        rc = cifs_filldir(current_entry, file,
                                        filldir, direntry, tmp_buf, max_len);
+                       if(rc == -EOVERFLOW) {
+                               rc = 0;
+                               break;
+                       }
+
                        file->f_pos++;
                        if(file->f_pos == 
                                cifsFile->srch_inf.index_of_last_entry) {