Commit MetaInfo

Revision42bb87b0bd83edfa400d4cd505327e5ad88980d3 (tree)
Time2018-05-09 15:36:25
AuthorYoshinori Sato <ysato@user...>
CommiterYoshinori Sato

Log Message

sync fs/

Change Summary

Incremental Difference

--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -394,7 +394,7 @@ static int prop_compression_apply(struct inode *inode,
394394 type = BTRFS_COMPRESS_LZO;
395395 else if (!strncmp("zlib", value, 4))
396396 type = BTRFS_COMPRESS_ZLIB;
397- else if (!strncmp("zstd", value, 4))
397+ else if (!strncmp("zstd", value, len))
398398 type = BTRFS_COMPRESS_ZSTD;
399399 else
400400 return -EINVAL;
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -48,26 +48,6 @@ struct btrfs_qgroup_extent_record {
4848 struct ulist *old_roots;
4949 };
5050
51-enum btrfs_qgroup_rsv_type {
52- BTRFS_QGROUP_RSV_DATA = 0,
53- BTRFS_QGROUP_RSV_META,
54- BTRFS_QGROUP_RSV_LAST,
55-};
56-
57-/*
58- * Represents how many bytes we have reserved for this qgroup.
59- *
60- * Each type should have different reservation behavior.
61- * E.g, data follows its io_tree flag modification, while
62- * *currently* meta is just reserve-and-clear during transcation.
63- *
64- * TODO: Add new type for reservation which can survive transaction commit.
65- * Currect metadata reservation behavior is not suitable for such case.
66- */
67-struct btrfs_qgroup_rsv {
68- u64 values[BTRFS_QGROUP_RSV_LAST];
69-};
70-
7151 /*
7252 * Qgroup reservation types:
7353 *
--- a/fs/cifs/Kconfig
+++ b/fs/cifs/Kconfig
@@ -203,14 +203,6 @@ config CIFS_SMB_DIRECT
203203 SMB Direct allows transferring SMB packets over RDMA. If unsure,
204204 say N.
205205
206-config CIFS_SMB_DIRECT
207- bool "SMB Direct support (Experimental)"
208- depends on CIFS && INFINIBAND
209- help
210- Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1.
211- SMB Direct allows transferring SMB packets over RDMA. If unsure,
212- say N.
213-
214206 config CIFS_FSCACHE
215207 bool "Provide CIFS client caching support"
216208 depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -903,44 +903,6 @@ smb2_send_recv(const unsigned int xid, struct cifs_ses *ses,
903903 return rc;
904904 }
905905
906-/* Like SendReceive2 but iov[0] does not contain an rfc1002 header */
907-int
908-smb2_send_recv(const unsigned int xid, struct cifs_ses *ses,
909- struct kvec *iov, int n_vec, int *resp_buf_type /* ret */,
910- const int flags, struct kvec *resp_iov)
911-{
912- struct smb_rqst rqst;
913- struct kvec *new_iov;
914- int rc;
915- int i;
916- __u32 count;
917- __be32 rfc1002_marker;
918-
919- new_iov = kmalloc(sizeof(struct kvec) * (n_vec + 1), GFP_KERNEL);
920- if (!new_iov)
921- return -ENOMEM;
922-
923- /* 1st iov is an RFC1002 Session Message length */
924- memcpy(new_iov + 1, iov, (sizeof(struct kvec) * n_vec));
925-
926- count = 0;
927- for (i = 1; i < n_vec + 1; i++)
928- count += new_iov[i].iov_len;
929-
930- rfc1002_marker = cpu_to_be32(count);
931-
932- new_iov[0].iov_base = &rfc1002_marker;
933- new_iov[0].iov_len = 4;
934-
935- memset(&rqst, 0, sizeof(struct smb_rqst));
936- rqst.rq_iov = new_iov;
937- rqst.rq_nvec = n_vec + 1;
938-
939- rc = cifs_send_recv(xid, ses, &rqst, resp_buf_type, flags, resp_iov);
940- kfree(new_iov);
941- return rc;
942-}
943-
944906 int
945907 SendReceive(const unsigned int xid, struct cifs_ses *ses,
946908 struct smb_hdr *in_buf, struct smb_hdr *out_buf,
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -685,8 +685,7 @@ static void dax_mapping_entry_mkclean(struct address_space *mapping,
685685
686686 if (pfn != pmd_pfn(*pmdp))
687687 goto unlock_pmd;
688- if (!pmd_dirty(*pmdp)
689- && !pmd_access_permitted(*pmdp, WRITE))
688+ if (!pmd_dirty(*pmdp) && !pmd_write(*pmdp))
690689 goto unlock_pmd;
691690
692691 flush_cache_page(vma, address, pfn);
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -292,8 +292,7 @@ void take_dentry_name_snapshot(struct name_snapshot *name, struct dentry *dentry
292292 spin_unlock(&dentry->d_lock);
293293 name->name = p->name;
294294 } else {
295- memcpy(name->inline_name, dentry->d_iname,
296- dentry->d_name.len + 1);
295+ memcpy(name->inline_name, dentry->d_iname, DNAME_INLINE_LEN);
297296 spin_unlock(&dentry->d_lock);
298297 name->name = name->inline_name;
299298 }
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1338,7 +1338,6 @@ void setup_new_exec(struct linux_binprm * bprm)
13381338 if (bprm->secureexec) {
13391339 /* Make sure parent cannot signal privileged process. */
13401340 current->pdeath_signal = 0;
1341- current->signal->pdeath_signal_proc = 0;
13421341
13431342 /*
13441343 * For secureexec, reset the stack limit to sane default to
--- a/fs/nfs/fscache.c
+++ b/fs/nfs/fscache.c
@@ -128,7 +128,7 @@ void nfs_fscache_get_super_cookie(struct super_block *sb, const char *uniq, int
128128 return;
129129
130130 key->nfs_client = nfss->nfs_client;
131- key->key.super.s_flags = sb->s_flags & NFS_SB_MASK;
131+ key->key.super.s_flags = sb->s_flags & NFS_MS_MASK;
132132 key->key.nfs_server.flags = nfss->flags;
133133 key->key.nfs_server.rsize = nfss->rsize;
134134 key->key.nfs_server.wsize = nfss->wsize;
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2391,7 +2391,7 @@ static int nfs_compare_mount_options(const struct super_block *s, const struct n
23912391 const struct rpc_clnt *clnt_a = a->client;
23922392 const struct rpc_clnt *clnt_b = b->client;
23932393
2394- if ((s->s_flags & NFS_SB_MASK) != (flags & NFS_SB_MASK))
2394+ if ((s->s_flags & NFS_MS_MASK) != (flags & NFS_MS_MASK))
23952395 goto Ebusy;
23962396 if (a->nfs_client != b->nfs_client)
23972397 goto Ebusy;
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -3534,7 +3534,7 @@ static int ocfs2_downconvert_lock(struct ocfs2_super *osb,
35343534 * we can recover correctly from node failure. Otherwise, we may get
35353535 * invalid LVB in LKB, but without DLM_SBF_VALNOTVALID being set.
35363536 */
3537- if (ocfs2_userspace_stack(osb) &&
3537+ if (!ocfs2_is_o2cb_active() &&
35383538 lockres->l_ops->flags & LOCK_TYPE_USES_LVB)
35393539 lvb = 1;
35403540
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -48,6 +48,12 @@ static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl";
4848 */
4949 static struct ocfs2_stack_plugin *active_stack;
5050
51+inline int ocfs2_is_o2cb_active(void)
52+{
53+ return !strcmp(active_stack->sp_name, OCFS2_STACK_PLUGIN_O2CB);
54+}
55+EXPORT_SYMBOL_GPL(ocfs2_is_o2cb_active);
56+
5157 static struct ocfs2_stack_plugin *ocfs2_stack_lookup(const char *name)
5258 {
5359 struct ocfs2_stack_plugin *p;
--- a/fs/ocfs2/stackglue.h
+++ b/fs/ocfs2/stackglue.h
@@ -298,6 +298,9 @@ void ocfs2_stack_glue_set_max_proto_version(struct ocfs2_protocol_version *max_p
298298 int ocfs2_stack_glue_register(struct ocfs2_stack_plugin *plugin);
299299 void ocfs2_stack_glue_unregister(struct ocfs2_stack_plugin *plugin);
300300
301+/* In ocfs2_downconvert_lock(), we need to know which stack we are using */
302+int ocfs2_is_o2cb_active(void);
303+
301304 extern struct kset *ocfs2_kset;
302305
303306 #endif /* STACKGLUE_H */
Show on old repository browser