* [PATCH V1 Resend 07/10] fs: Drop unlikely before IS_ERR(_OR_NULL) [not found] ` <cover.1439375087.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> @ 2015-08-12 10:29 ` Viresh Kumar 2015-08-12 18:28 ` Jeff Layton 0 siblings, 1 reply; 4+ messages in thread From: Viresh Kumar @ 2015-08-12 10:29 UTC (permalink / raw) To: trivial-DgEjT+Ai2ygdnm+yROfE0A Cc: linaro-kernel-cunTk1MwBs8s++Sfvej+rw, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Viresh Kumar, David Howells, Alexander Viro, Andreas Dilger, Andrew Morton, Anna Schumaker, Boaz Harrosh, Christoph Hellwig, open list:ECRYPT FILE SYSTEM, Eric W. Biederman, Fabian Frederick, open list:COMMON INTERNET FILE SYSTEM (CIFS), open list:EXT4 FILE SYSTEM, open list:FILESYSTEMS (VFS and infrastructure), open list:NFS, SUNRPC, AND LOCKD CLIENTS, Peng Tao, Petr Vandrovec, samb IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there is no need to do that again from its callers. Drop it. Reviewed-by: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Signed-off-by: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> --- fs/cifs/readdir.c | 2 +- fs/ecryptfs/inode.c | 2 +- fs/ext4/extents.c | 6 +++--- fs/ext4/namei.c | 2 +- fs/namei.c | 4 ++-- fs/ncpfs/dir.c | 2 +- fs/nfs/objlayout/objio_osd.c | 2 +- fs/proc/proc_sysctl.c | 2 +- 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, cifs_dbg(FYI, "%s: for %s\n", __func__, name->name); dentry = d_hash_and_lookup(parent, name); - if (unlikely(IS_ERR(dentry))) + if (IS_ERR(dentry)) return; 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, ecryptfs_inode = ecryptfs_do_create(directory_inode, ecryptfs_dentry, mode); - if (unlikely(IS_ERR(ecryptfs_inode))) { + if (IS_ERR(ecryptfs_inode)) { ecryptfs_printk(KERN_WARNING, "Failed to create file in" "lower filesystem\n"); 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, bh = read_extent_tree_block(inode, path[ppos].p_block, --i, flags); - if (unlikely(IS_ERR(bh))) { + if (IS_ERR(bh)) { ret = PTR_ERR(bh); goto err; } @@ -5792,7 +5792,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, int split = 0; path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE); - if (unlikely(IS_ERR(path1))) { + if (IS_ERR(path1)) { *erp = PTR_ERR(path1); path1 = NULL; finish: @@ -5800,7 +5800,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, goto repeat; } path2 = ext4_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE); - if (unlikely(IS_ERR(path2))) { + if (IS_ERR(path2)) { *erp = PTR_ERR(path2); path2 = NULL; goto finish; diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 9f61e7679a6d..f12b277ad2af 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1429,7 +1429,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, } num++; bh = ext4_getblk(NULL, dir, b++, 0); - if (unlikely(IS_ERR(bh))) { + if (IS_ERR(bh)) { if (ra_max == 0) { ret = bh; goto cleanup_and_exit; diff --git a/fs/namei.c b/fs/namei.c index cacc51ddcf54..67d419e55547 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1942,7 +1942,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) if (err) { const char *s = get_link(nd); - if (unlikely(IS_ERR(s))) + if (IS_ERR(s)) return PTR_ERR(s); err = 0; if (unlikely(!s)) { @@ -3430,7 +3430,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, return ERR_PTR(-ELOOP); filename = getname_kernel(name); - if (unlikely(IS_ERR(filename))) + if (IS_ERR(filename)) return ERR_CAST(filename); 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, qname.name = __name; newdent = d_hash_and_lookup(dentry, &qname); - if (unlikely(IS_ERR(newdent))) + if (IS_ERR(newdent)) goto end_advance; if (!newdent) { 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, retry_lookup: od = osduld_info_lookup(&odi); - if (unlikely(IS_ERR(od))) { + if (IS_ERR(od)) { err = PTR_ERR(od); dprintk("%s: osduld_info_lookup => %d\n", __func__, err); 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, found: subdir->header.nreg++; failed: - if (unlikely(IS_ERR(subdir))) { + if (IS_ERR(subdir)) { pr_err("sysctl could not get directory: "); sysctl_print_dir(dir); pr_cont("/%*.*s %ld\n", -- 2.4.0 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V1 Resend 07/10] fs: Drop unlikely before IS_ERR(_OR_NULL) 2015-08-12 10:29 ` [PATCH V1 Resend 07/10] fs: Drop unlikely before IS_ERR(_OR_NULL) Viresh Kumar @ 2015-08-12 18:28 ` Jeff Layton 2015-08-20 16:08 ` Steve French 0 siblings, 1 reply; 4+ messages in thread From: Jeff Layton @ 2015-08-12 18:28 UTC (permalink / raw) To: Viresh Kumar Cc: Boaz Harrosh, open list:NFS, Peng Tao <tao.peng@primarydata.com>, Petr Vandrovec <petr@vandrovec.name>, samba-technical@lists.samba.org moderated list:COMMON INTERNET FILE SYSTEM CIFS, Steve French <sfrench@samba.org>, "Theodore Ts'o" <tytso@mit.edu>, Tom Haynes <loghyr@primarydata.com>, Trond Myklebust <trond.myklebust@primarydata.com>, Tyler Hicks <tyhicks@canonical.com>, Weston Andros Adamson <dros@primarydata.com>, linaro-kernel, trivial, open list:COMMON INTERNET FILE SYSTEM CIFS, open list:ECRYPT FILE SYSTEM, linux-kernel, Christoph Hellwig, David Howells, open list:FILESYSTEMS VFS and infrastructure, Andreas Dilger On Wed, 12 Aug 2015 15:59:44 +0530 Viresh Kumar <viresh.kumar@linaro.org> wrote: > IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there > is no need to do that again from its callers. Drop it. > > Reviewed-by: David Howells <dhowells@redhat.com> > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > fs/cifs/readdir.c | 2 +- > fs/ecryptfs/inode.c | 2 +- > fs/ext4/extents.c | 6 +++--- > fs/ext4/namei.c | 2 +- > fs/namei.c | 4 ++-- > fs/ncpfs/dir.c | 2 +- > fs/nfs/objlayout/objio_osd.c | 2 +- > fs/proc/proc_sysctl.c | 2 +- > 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, > cifs_dbg(FYI, "%s: for %s\n", __func__, name->name); > > dentry = d_hash_and_lookup(parent, name); > - if (unlikely(IS_ERR(dentry))) > + if (IS_ERR(dentry)) > return; > > 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, > > ecryptfs_inode = ecryptfs_do_create(directory_inode, ecryptfs_dentry, > mode); > - if (unlikely(IS_ERR(ecryptfs_inode))) { > + if (IS_ERR(ecryptfs_inode)) { > ecryptfs_printk(KERN_WARNING, "Failed to create file in" > "lower filesystem\n"); > 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, > > bh = read_extent_tree_block(inode, path[ppos].p_block, --i, > flags); > - if (unlikely(IS_ERR(bh))) { > + if (IS_ERR(bh)) { > ret = PTR_ERR(bh); > goto err; > } > @@ -5792,7 +5792,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, > int split = 0; > > path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE); > - if (unlikely(IS_ERR(path1))) { > + if (IS_ERR(path1)) { > *erp = PTR_ERR(path1); > path1 = NULL; > finish: > @@ -5800,7 +5800,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, > goto repeat; > } > path2 = ext4_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE); > - if (unlikely(IS_ERR(path2))) { > + if (IS_ERR(path2)) { > *erp = PTR_ERR(path2); > path2 = NULL; > goto finish; > diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c > index 9f61e7679a6d..f12b277ad2af 100644 > --- a/fs/ext4/namei.c > +++ b/fs/ext4/namei.c > @@ -1429,7 +1429,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, > } > num++; > bh = ext4_getblk(NULL, dir, b++, 0); > - if (unlikely(IS_ERR(bh))) { > + if (IS_ERR(bh)) { > if (ra_max == 0) { > ret = bh; > goto cleanup_and_exit; > diff --git a/fs/namei.c b/fs/namei.c > index cacc51ddcf54..67d419e55547 100644 > --- a/fs/namei.c > +++ b/fs/namei.c > @@ -1942,7 +1942,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) > if (err) { > const char *s = get_link(nd); > > - if (unlikely(IS_ERR(s))) > + if (IS_ERR(s)) > return PTR_ERR(s); > err = 0; > if (unlikely(!s)) { > @@ -3430,7 +3430,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, > return ERR_PTR(-ELOOP); > > filename = getname_kernel(name); > - if (unlikely(IS_ERR(filename))) > + if (IS_ERR(filename)) > return ERR_CAST(filename); > > 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, > qname.name = __name; > > newdent = d_hash_and_lookup(dentry, &qname); > - if (unlikely(IS_ERR(newdent))) > + if (IS_ERR(newdent)) > goto end_advance; > if (!newdent) { > 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, > > retry_lookup: > od = osduld_info_lookup(&odi); > - if (unlikely(IS_ERR(od))) { > + if (IS_ERR(od)) { > err = PTR_ERR(od); > dprintk("%s: osduld_info_lookup => %d\n", __func__, err); > 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, > found: > subdir->header.nreg++; > failed: > - if (unlikely(IS_ERR(subdir))) { > + if (IS_ERR(subdir)) { > pr_err("sysctl could not get directory: "); > sysctl_print_dir(dir); > pr_cont("/%*.*s %ld\n", Looks fine to me. You can add: Reviewed-by: Jeff Layton <jlayton@poochiereds.net> ...but the problem is that you have a patch here that touches several different filesystems. You'll have to find someone willing to take it into some overarching tree (Al's perhaps, or maybe Andrew's?), or break it up into several per-fs patches and shepherd it into different maintainers' trees. ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V1 Resend 07/10] fs: Drop unlikely before IS_ERR(_OR_NULL) 2015-08-12 18:28 ` Jeff Layton @ 2015-08-20 16:08 ` Steve French [not found] ` <CAH2r5mvUC2WO6sVqhe_QCgiCJbRbahDsSj=-Uzk7LB_peTqjLQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 4+ messages in thread From: Steve French @ 2015-08-20 16:08 UTC (permalink / raw) To: Jeff Layton Cc: Viresh Kumar, Boaz Harrosh, open list:NFS, Peng Tao <tao.peng@primarydata.com>, Petr Vandrovec <petr@vandrovec.name>, samba-technical@lists.samba.org moderated list:COMMON INTERNET FILE SYSTEM CIFS, Steve French <sfrench@samba.org>, Theodore Ts'o <tytso@mit.edu>, Tom Haynes <loghyr@primarydata.com>, Trond Myklebust <trond.myklebust@primarydata.com>, Tyler Hicks <tyhicks@canonical.com>, Weston Andros Adamson <dros@primarydata.com>, linaro-kernel, Jiri Kosina, open list:COMMON INTERNET FILE SYSTEM CIFS On Wed, Aug 12, 2015 at 1:28 PM, Jeff Layton <jlayton@poochiereds.net> wrote: > On Wed, 12 Aug 2015 15:59:44 +0530 > Viresh Kumar <viresh.kumar@linaro.org> wrote: > >> IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there >> is no need to do that again from its callers. Drop it. >> >> Reviewed-by: David Howells <dhowells@redhat.com> >> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> >> --- >> fs/cifs/readdir.c | 2 +- >> fs/ecryptfs/inode.c | 2 +- >> fs/ext4/extents.c | 6 +++--- >> fs/ext4/namei.c | 2 +- >> fs/namei.c | 4 ++-- >> fs/ncpfs/dir.c | 2 +- >> fs/nfs/objlayout/objio_osd.c | 2 +- >> fs/proc/proc_sysctl.c | 2 +- >> 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, >> cifs_dbg(FYI, "%s: for %s\n", __func__, name->name); >> >> dentry = d_hash_and_lookup(parent, name); >> - if (unlikely(IS_ERR(dentry))) >> + if (IS_ERR(dentry)) >> return; >> >> 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, >> >> ecryptfs_inode = ecryptfs_do_create(directory_inode, ecryptfs_dentry, >> mode); >> - if (unlikely(IS_ERR(ecryptfs_inode))) { >> + if (IS_ERR(ecryptfs_inode)) { >> ecryptfs_printk(KERN_WARNING, "Failed to create file in" >> "lower filesystem\n"); >> 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, >> >> bh = read_extent_tree_block(inode, path[ppos].p_block, --i, >> flags); >> - if (unlikely(IS_ERR(bh))) { >> + if (IS_ERR(bh)) { >> ret = PTR_ERR(bh); >> goto err; >> } >> @@ -5792,7 +5792,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, >> int split = 0; >> >> path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE); >> - if (unlikely(IS_ERR(path1))) { >> + if (IS_ERR(path1)) { >> *erp = PTR_ERR(path1); >> path1 = NULL; >> finish: >> @@ -5800,7 +5800,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, >> goto repeat; >> } >> path2 = ext4_find_extent(inode2, lblk2, NULL, EXT4_EX_NOCACHE); >> - if (unlikely(IS_ERR(path2))) { >> + if (IS_ERR(path2)) { >> *erp = PTR_ERR(path2); >> path2 = NULL; >> goto finish; >> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c >> index 9f61e7679a6d..f12b277ad2af 100644 >> --- a/fs/ext4/namei.c >> +++ b/fs/ext4/namei.c >> @@ -1429,7 +1429,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, >> } >> num++; >> bh = ext4_getblk(NULL, dir, b++, 0); >> - if (unlikely(IS_ERR(bh))) { >> + if (IS_ERR(bh)) { >> if (ra_max == 0) { >> ret = bh; >> goto cleanup_and_exit; >> diff --git a/fs/namei.c b/fs/namei.c >> index cacc51ddcf54..67d419e55547 100644 >> --- a/fs/namei.c >> +++ b/fs/namei.c >> @@ -1942,7 +1942,7 @@ static int link_path_walk(const char *name, struct nameidata *nd) >> if (err) { >> const char *s = get_link(nd); >> >> - if (unlikely(IS_ERR(s))) >> + if (IS_ERR(s)) >> return PTR_ERR(s); >> err = 0; >> if (unlikely(!s)) { >> @@ -3430,7 +3430,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, >> return ERR_PTR(-ELOOP); >> >> filename = getname_kernel(name); >> - if (unlikely(IS_ERR(filename))) >> + if (IS_ERR(filename)) >> return ERR_CAST(filename); >> >> 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, >> qname.name = __name; >> >> newdent = d_hash_and_lookup(dentry, &qname); >> - if (unlikely(IS_ERR(newdent))) >> + if (IS_ERR(newdent)) >> goto end_advance; >> if (!newdent) { >> 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, >> >> retry_lookup: >> od = osduld_info_lookup(&odi); >> - if (unlikely(IS_ERR(od))) { >> + if (IS_ERR(od)) { >> err = PTR_ERR(od); >> dprintk("%s: osduld_info_lookup => %d\n", __func__, err); >> 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, >> found: >> subdir->header.nreg++; >> failed: >> - if (unlikely(IS_ERR(subdir))) { >> + if (IS_ERR(subdir)) { >> pr_err("sysctl could not get directory: "); >> sysctl_print_dir(dir); >> pr_cont("/%*.*s %ld\n", > > Looks fine to me. You can add: > > Reviewed-by: Jeff Layton <jlayton@poochiereds.net> > > ...but the problem is that you have a patch here that touches several > different filesystems. You'll have to find someone willing to take it > into some overarching tree (Al's perhaps, or maybe Andrew's?), or break > it up into several per-fs patches and shepherd it into different > maintainers' trees. Reviewed-by: Steve French <smfrench@gmail.com> Do you want me to merge the fs/cifs part of this independently (into cifs-2.6.git staging tree) or are you going to merge all of this (which changes multiple fs) at one time through someone else's tree? -- Thanks, Steve ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <CAH2r5mvUC2WO6sVqhe_QCgiCJbRbahDsSj=-Uzk7LB_peTqjLQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH V1 Resend 07/10] fs: Drop unlikely before IS_ERR(_OR_NULL) [not found] ` <CAH2r5mvUC2WO6sVqhe_QCgiCJbRbahDsSj=-Uzk7LB_peTqjLQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2015-08-20 16:14 ` Viresh Kumar 0 siblings, 0 replies; 4+ messages in thread From: Viresh Kumar @ 2015-08-20 16:14 UTC (permalink / raw) To: Steve French Cc: Jeff Layton, Boaz Harrosh, open list:NFS, Peng Tao <tao.peng-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>, Petr Vandrovec <petr-vPk2MGR0e28uaRcfnNAh7A@public.gmane.org>, samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org moderated list:COMMON INTERNET FILE SYSTEM CIFS, Steve French <sfrench-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>, Theodore Ts'o <tytso-3s7WtUTddSA@public.gmane.org>, Tom Haynes <loghyr-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>, Trond Myklebust <trond.myklebust-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>, Tyler Hicks <tyhicks-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>, Weston Andros Adamson <dros-7I+n7zu2hftEKMMhf/gKZA@public.gmane.org>, linaro-kernel-cunTk1MwBs8s++Sfvej+rw, Jiri Kosina, open list:COMMON INTERNET FILE SYSTEM CIFS, open list:ECRYPT FILE SYSTEM, LKML, Christoph Hellwig, David Howells, "open list:FILESYSTEMS VFS and infrastructure" <linux-fsde On 20-08-15, 11:08, Steve French wrote: > Reviewed-by: Steve French <smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > > Do you want me to merge the fs/cifs part of this independently (into > cifs-2.6.git staging tree) or are you going to merge all of this > (which changes multiple fs) at one time through someone else's tree? The plan is to merge via Trivial tree, but the Maintainer isn't responding yet :) -- viresh -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-20 16:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1439375087.git.viresh.kumar@linaro.org>
[not found] ` <cover.1439375087.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-08-12 10:29 ` [PATCH V1 Resend 07/10] fs: Drop unlikely before IS_ERR(_OR_NULL) Viresh Kumar
2015-08-12 18:28 ` Jeff Layton
2015-08-20 16:08 ` Steve French
[not found] ` <CAH2r5mvUC2WO6sVqhe_QCgiCJbRbahDsSj=-Uzk7LB_peTqjLQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-08-20 16:14 ` Viresh Kumar
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).