Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4b8a8f1e4f94fd87747e6e3acef74cf0b4dc0dae

Authored by Al Viro
1 parent 7bee130e22
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

get rid of the last free_pipe_info() callers 

and rename __free_pipe_info() to free_pipe_info()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 3 changed files with 8 additions and 15 deletions Side-by-side Diff

... ... @@ -751,7 +751,7 @@
751 751 __pipe_unlock(pipe);
752 752  
753 753 if (kill)
754   - __free_pipe_info(pipe);
  754 + free_pipe_info(pipe);
755 755  
756 756 return 0;
757 757 }
... ... @@ -795,7 +795,7 @@
795 795 return NULL;
796 796 }
797 797  
798   -void __free_pipe_info(struct pipe_inode_info *pipe)
  798 +void free_pipe_info(struct pipe_inode_info *pipe)
799 799 {
800 800 int i;
801 801  
... ... @@ -810,12 +810,6 @@
810 810 kfree(pipe);
811 811 }
812 812  
813   -void free_pipe_info(struct inode *inode)
814   -{
815   - __free_pipe_info(inode->i_pipe);
816   - inode->i_pipe = NULL;
817   -}
818   -
819 813 static struct vfsmount *pipe_mnt __read_mostly;
820 814  
821 815 /*
822 816  
... ... @@ -911,12 +905,12 @@
911 905 err_file:
912 906 put_filp(f);
913 907 err_dentry:
914   - free_pipe_info(inode);
  908 + free_pipe_info(inode->i_pipe);
915 909 path_put(&path);
916 910 return err;
917 911  
918 912 err_inode:
919   - free_pipe_info(inode);
  913 + free_pipe_info(inode->i_pipe);
920 914 iput(inode);
921 915 return err;
922 916 }
... ... @@ -1039,7 +1033,7 @@
1039 1033 if (unlikely(inode->i_pipe)) {
1040 1034 inode->i_pipe->files++;
1041 1035 spin_unlock(&inode->i_lock);
1042   - __free_pipe_info(pipe);
  1036 + free_pipe_info(pipe);
1043 1037 pipe = inode->i_pipe;
1044 1038 } else {
1045 1039 inode->i_pipe = pipe;
... ... @@ -1143,7 +1137,7 @@
1143 1137 spin_unlock(&inode->i_lock);
1144 1138 __pipe_unlock(pipe);
1145 1139 if (kill)
1146   - __free_pipe_info(pipe);
  1140 + free_pipe_info(pipe);
1147 1141 return ret;
1148 1142 }
1149 1143  
include/linux/pipe_fs_i.h
Diff comments   View file @ 4b8a8f1
... ... @@ -147,8 +147,7 @@
147 147 void pipe_wait(struct pipe_inode_info *pipe);
148 148  
149 149 struct pipe_inode_info *alloc_pipe_info(void);
150   -void free_pipe_info(struct inode * inode);
151   -void __free_pipe_info(struct pipe_inode_info *);
  150 +void free_pipe_info(struct pipe_inode_info *);
152 151  
153 152 /* Generic pipe buffer ops functions */
154 153 void *generic_pipe_buf_map(struct pipe_inode_info *, struct pipe_buffer *, int);
... ... @@ -847,7 +847,7 @@
847 847 exit_io_context(tsk);
848 848  
849 849 if (tsk->splice_pipe)
850   - __free_pipe_info(tsk->splice_pipe);
  850 + free_pipe_info(tsk->splice_pipe);
851 851  
852 852 if (tsk->task_frag.page)
853 853 put_page(tsk->task_frag.page);