diff for duplicates of <20120430143621.GK6447@mwanda> diff --git a/a/1.txt b/N1/1.txt index b3cf321..45c2775 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ index 811245b..4a6ad20 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -699,7 +699,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin) - * origin = SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate + * origin == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate * the cached file length */ - if (origin != SEEK_SET || origin != SEEK_CUR) { diff --git a/a/content_digest b/N1/content_digest index dbcf159..b406ed4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0CAKywueQrrHdqXXrHQbP=vjs_MLjksvR09cpax0iWw-PS6ms=fg@mail.gmail.com\0" "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch v2] cifs: fix revalidation test in cifs_llseek()\0" - "Date\0Mon, 30 Apr 2012 14:36:21 +0000\0" + "Date\0Mon, 30 Apr 2012 17:36:21 +0300\0" "To\0Pavel Shilovsky <piastryyy@gmail.com>\0" "Cc\0Steve French <sfrench@samba.org>" linux-cifs@vger.kernel.org @@ -24,7 +24,7 @@ "--- a/fs/cifs/cifsfs.c\n" "+++ b/fs/cifs/cifsfs.c\n" "@@ -699,7 +699,7 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int origin)\n" - " \t * origin = SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate\n" + " \t * origin == SEEK_END || SEEK_DATA || SEEK_HOLE => we must revalidate\n" " \t * the cached file length\n" " \t */\n" "-\tif (origin != SEEK_SET || origin != SEEK_CUR) {\n" @@ -32,4 +32,4 @@ " \t\tint rc;\n" " \t\tstruct inode *inode = file->f_path.dentry->d_inode;" -5b1cd9c1ac7027341d714a72bb869d8ef59a5d50e063d487877dc6760f11ed87 +b3a16b0e6ec4d55280642ceeeaba3ea163dfdaacdc5077b81575efc04f5e1056
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.