remove queue-3.10/cifs-set-file_created.patch

diff --git a/queue-3.10/cifs-set-file_created.patch b/queue-3.10/cifs-set-file_created.patch
deleted file mode 100644 (file)
index febb123..0000000
--- a/queue-3.10/cifs-set-file_created.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From f1e3268126a35b9d3cb8bf67487fcc6cd13991d8 Mon Sep 17 00:00:00 2001
-From: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
-Date: Wed, 11 Dec 2013 16:29:53 -0600
-Subject: cifs: set FILE_CREATED
-
-From: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
-
-commit f1e3268126a35b9d3cb8bf67487fcc6cd13991d8 upstream.
-
-Set FILE_CREATED on O_CREAT|O_EXCL.
-
-cifs code didn't change during commit 116cc0225381415b96551f725455d067f63a76a0
-
-Kernel bugzilla 66251
-
-Signed-off-by: Shirish Pargaonkar <spargaonkar@suse.com>
-Acked-by: Jeff Layton <jlayton@redhat.com>
-Signed-off-by: Steve French <smfrench@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/cifs/dir.c |   11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
---- a/fs/cifs/dir.c
-+++ b/fs/cifs/dir.c
-@@ -192,7 +192,7 @@ check_name(struct dentry *direntry)
- static int
- cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
-              struct tcon_link *tlink, unsigned oflags, umode_t mode,
--             __u32 *oplock, struct cifs_fid *fid, int *created)
-+             __u32 *oplock, struct cifs_fid *fid)
- {
-       int rc = -ENOENT;
-       int create_options = CREATE_NOT_DIR;
-@@ -340,7 +340,6 @@ cifs_do_create(struct inode *inode, stru
-                               .device = 0,
-               };
- 
--              *created |= FILE_CREATED;
-               if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
-                       args.uid = current_fsuid();
-                       if (inode->i_mode & S_ISGID)
-@@ -471,13 +470,16 @@ cifs_atomic_open(struct inode *inode, st
-       cifs_add_pending_open(&fid, tlink, &open);
- 
-       rc = cifs_do_create(inode, direntry, xid, tlink, oflags, mode,
--                          &oplock, &fid, opened);
-+                          &oplock, &fid);
- 
-       if (rc) {
-               cifs_del_pending_open(&open);
-               goto out;
-       }
- 
-+      if ((oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-+              *opened |= FILE_CREATED;
-+
-       rc = finish_open(file, direntry, generic_file_open, opened);
-       if (rc) {
-               if (server->ops->close)
-@@ -520,7 +522,6 @@ int cifs_create(struct inode *inode, str
-       struct TCP_Server_Info *server;
-       struct cifs_fid fid;
-       __u32 oplock;
--      int created = FILE_CREATED;
- 
-       cifs_dbg(FYI, "cifs_create parent inode = 0x%p name is: %s and dentry = 0x%p\n",
-                inode, direntry->d_name.name, direntry);
-@@ -537,7 +538,7 @@ int cifs_create(struct inode *inode, str
-               server->ops->new_lease_key(&fid);
- 
-       rc = cifs_do_create(inode, direntry, xid, tlink, oflags, mode,
--                          &oplock, &fid, &created);
-+                          &oplock, &fid);
-       if (!rc && server->ops->close)
-               server->ops->close(xid, tcon, &fid);
- 

diff --git a/queue-3.10/series b/queue-3.10/series
index 667a841888ed0c1f81aea2807948dbe5f7a63e02..7042f1f6ba75a3d1a197e5d1db3a334857819d8e 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -62,7 +62,6 @@ libata-add-ata_horkage_broken_fpdma_aa-quirk-for-seagate-momentus-spinpoint-m8.p
 libata-add-atapi_dmadir-force-flag.patch
 libata-disable-a-disk-via-libata.force-params.patch
 libata-freezer-avoid-block-device-removal-while-system-is-frozen.patch
-cifs-set-file_created.patch
 radiotap-fix-bitmap-end-finding-buffer-overrun.patch
 rtlwifi-pci-fix-oops-on-driver-unload.patch
 intel_pstate-fail-initialization-if-p-state-information-is-missing.patch