diff for duplicates of <20120419210619.GA19074@elgon.mountain> diff --git a/a/1.txt b/N1/1.txt index 1a90a17..472ffc8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,10 +16,10 @@ index d342128..97d26c7 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -695,7 +695,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) { -+ if (origin = SEEK_SET || origin = SEEK_CUR) { ++ if (origin == SEEK_SET || origin == SEEK_CUR) { int rc; struct inode *inode = file->f_path.dentry->d_inode; diff --git a/a/content_digest b/N1/content_digest index ef72e3d..97f1e87 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] cifs: fix revalidation test in cifs_llseek()\0" - "Date\0Thu, 19 Apr 2012 21:06:19 +0000\0" + "Date\0Fri, 20 Apr 2012 00:06:19 +0300\0" "To\0Steve French <sfrench@samba.org>\0" "Cc\0linux-cifs@vger.kernel.org" kernel-janitors@vger.kernel.org @@ -26,12 +26,12 @@ "--- a/fs/cifs/cifsfs.c\n" "+++ b/fs/cifs/cifsfs.c\n" "@@ -695,7 +695,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" - "+\tif (origin = SEEK_SET || origin = SEEK_CUR) {\n" + "+\tif (origin == SEEK_SET || origin == SEEK_CUR) {\n" " \t\tint rc;\n" " \t\tstruct inode *inode = file->f_path.dentry->d_inode;" -986f544ed728d874f783390025fb6d7371ee77e7108cb3e3cb856d7e22c4d86c +ebe44a354f5bce68b731db980aeada01e73944d5aaf5c1e8436152bc3edb7e77
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.