aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/cifs/readdir.c2
-rw-r--r--fs/ecryptfs/inode.c2
-rw-r--r--fs/ext4/extents.c6
-rw-r--r--fs/ext4/namei.c2
-rw-r--r--fs/namei.c4
-rw-r--r--fs/ncpfs/dir.c2
-rw-r--r--fs/nfs/objlayout/objio_osd.c2
-rw-r--r--fs/proc/proc_sysctl.c2
8 files changed, 11 insertions, 11 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index b1eede3678a9..0557c45e9c33 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -84,7 +84,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
84 cifs_dbg(FYI, "%s: for %s\n", __func__, name->name); 84 cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
85 85
86 dentry = d_hash_and_lookup(parent, name); 86 dentry = d_hash_and_lookup(parent, name);
87 if (unlikely(IS_ERR(dentry))) 87 if (IS_ERR(dentry))
88 return; 88 return;
89 89
90 if (dentry) { 90 if (dentry) {
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 3c4db1172d22..e2e47ba5d313 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -270,7 +270,7 @@ ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry,
270 270
271 ecryptfs_inode = ecryptfs_do_create(directory_inode, ecryptfs_dentry, 271 ecryptfs_inode = ecryptfs_do_create(directory_inode, ecryptfs_dentry,
272 mode); 272 mode);
273 if (unlikely(IS_ERR(ecryptfs_inode))) { 273 if (IS_ERR(ecryptfs_inode)) {
274 ecryptfs_printk(KERN_WARNING, "Failed to create file in" 274 ecryptfs_printk(KERN_WARNING, "Failed to create file in"
275 "lower filesystem\n"); 275 "lower filesystem\n");
276 rc = PTR_ERR(ecryptfs_inode); 276 rc = PTR_ERR(ecryptfs_inode);
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 2553aa8b608d..799f01714767 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -899,7 +899,7 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
899 899
900 bh = read_extent_tree_block(inode, path[ppos].p_block, --i, 900 bh = read_extent_tree_block(inode, path[ppos].p_block, --i,
901 flags); 901 flags);
902 if (unlikely(IS_ERR(bh))) { 902 if (IS_ERR(bh)) {
903 ret = PTR_ERR(bh); 903 ret = PTR_ERR(bh);
904 goto err; 904 goto err;
905 } 905 }
@@ -5792,7 +5792,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
5792 int split = 0; 5792 int split = 0;
5793 5793
5794 path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE); 5794 path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE);
5795 if (unlikely(IS_ERR(path1))) { 5795 if (IS_ERR(path1)) {
5796 *erp = PTR_ERR(path1); 5796 *erp = PTR_ERR(path1);
5797 path1 = NULL; 5797 path1 = NULL;
5798 finish: 5798 finish:
@@ -5800,7 +5800,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
5800 goto repeat; 5800 goto repeat;
5801 } 5801 }
5802 path2 = ext4_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE); 5802 path2 = ext4_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE);
5803 if (unlikely(IS_ERR(path2))) { 5803 if (IS_ERR(path2)) {
5804 *erp = PTR_ERR(path2); 5804 *erp = PTR_ERR(path2);
5805 path2 = NULL; 5805 path2 = NULL;
5806 goto finish; 5806 goto finish;
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 011dcfb5cce3..0554e4be1fb8 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1429,7 +1429,7 @@ restart:
1429 } 1429 }
1430 num++; 1430 num++;
1431 bh = ext4_getblk(NULL, dir, b++, 0); 1431 bh = ext4_getblk(NULL, dir, b++, 0);
1432 if (unlikely(IS_ERR(bh))) { 1432 if (IS_ERR(bh)) {
1433 if (ra_max == 0) { 1433 if (ra_max == 0) {
1434 ret = bh; 1434 ret = bh;
1435 goto cleanup_and_exit; 1435 goto cleanup_and_exit;
diff --git a/fs/namei.c b/fs/namei.c
index fbbcf0993312..d3f84069a9aa 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1942,7 +1942,7 @@ OK:
1942 if (err) { 1942 if (err) {
1943 const char *s = get_link(nd); 1943 const char *s = get_link(nd);
1944 1944
1945 if (unlikely(IS_ERR(s))) 1945 if (IS_ERR(s))
1946 return PTR_ERR(s); 1946 return PTR_ERR(s);
1947 err = 0; 1947 err = 0;
1948 if (unlikely(!s)) { 1948 if (unlikely(!s)) {
@@ -3356,7 +3356,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt,
3356 return ERR_PTR(-ELOOP); 3356 return ERR_PTR(-ELOOP);
3357 3357
3358 filename = getname_kernel(name); 3358 filename = getname_kernel(name);
3359 if (unlikely(IS_ERR(filename))) 3359 if (IS_ERR(filename))
3360 return ERR_CAST(filename); 3360 return ERR_CAST(filename);
3361 3361
3362 set_nameidata(&nd, -1, filename); 3362 set_nameidata(&nd, -1, filename);
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 93575e91a7aa..356816e7bc90 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -597,7 +597,7 @@ ncp_fill_cache(struct file *file, struct dir_context *ctx,
597 qname.name = __name; 597 qname.name = __name;
598 598
599 newdent = d_hash_and_lookup(dentry, &qname); 599 newdent = d_hash_and_lookup(dentry, &qname);
600 if (unlikely(IS_ERR(newdent))) 600 if (IS_ERR(newdent))
601 goto end_advance; 601 goto end_advance;
602 if (!newdent) { 602 if (!newdent) {
603 newdent = d_alloc(dentry, &qname); 603 newdent = d_alloc(dentry, &qname);
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index 5aaed363556a..5c0c6b58157f 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -124,7 +124,7 @@ objio_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,
124 124
125retry_lookup: 125retry_lookup:
126 od = osduld_info_lookup(&odi); 126 od = osduld_info_lookup(&odi);
127 if (unlikely(IS_ERR(od))) { 127 if (IS_ERR(od)) {
128 err = PTR_ERR(od); 128 err = PTR_ERR(od);
129 dprintk("%s: osduld_info_lookup => %d\n", __func__, err); 129 dprintk("%s: osduld_info_lookup => %d\n", __func__, err);
130 if (err == -ENODEV && retry_flag) { 130 if (err == -ENODEV && retry_flag) {
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index fdda62e6115e..fe5b6e6c4671 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -948,7 +948,7 @@ static struct ctl_dir *get_subdir(struct ctl_dir *dir,
948found: 948found:
949 subdir->header.nreg++; 949 subdir->header.nreg++;
950failed: 950failed:
951 if (unlikely(IS_ERR(subdir))) { 951 if (IS_ERR(subdir)) {
952 pr_err("sysctl could not get directory: "); 952 pr_err("sysctl could not get directory: ");
953 sysctl_print_dir(dir); 953 sysctl_print_dir(dir);
954 pr_cont("/%*.*s %ld\n", 954 pr_cont("/%*.*s %ld\n",