From: Pavel Shilovsky Date: Thu, 11 Jul 2013 06:58:30 +0000 (+0400) Subject: CIFS: Reopen the file if reconnect durable handle failed X-Git-Tag: upstream/snapshot3+hdmi~4708^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b33fcf1c9d359374ef6e8e7ec1e0b6f7a8717e16;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git CIFS: Reopen the file if reconnect durable handle failed This is a follow-on patch for 8/8 patch from the durable handles series. It fixes the problem when durable file handle timeout expired on the server and reopen returns -ENOENT for such files. Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French --- diff --git a/fs/cifs/file.c b/fs/cifs/file.c index ba7eed2..1dc9dea 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -681,6 +681,13 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) * not dirty locally we could do this. */ rc = server->ops->open(xid, &oparms, &oplock, NULL); + if (rc == -ENOENT && oparms.reconnect == false) { + /* durable handle timeout is expired - open the file again */ + rc = server->ops->open(xid, &oparms, &oplock, NULL); + /* indicate that we need to relock the file */ + oparms.reconnect = true; + } + if (rc) { mutex_unlock(&cfile->fh_mutex); cifs_dbg(FYI, "cifs_reopen returned 0x%x\n", rc); @@ -1510,7 +1517,6 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type, if (!rc) goto out; - /* * Windows 7 server can delay breaking lease from read to None * if we set a byte-range lock on a file - break it explicitly